CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:24:02 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.15 -r1.134.2.16 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.15 -r1.132.2.16 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.14 -r1.13.2.15 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.14 -r1.24.2.15 \
src/sys/compat/netbsd32/netbsd32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.16
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:24:02 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.16 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -482,9 +482,13 @@
/* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
#define NETBSD32_SYS_netbsd32_ntp_adjtime 176
+#else
+/* 176 is excluded ntp_adjtime */
+#endif
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.15
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:24:02 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.15 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -913,11 +913,14 @@ struct compat_30_netbsd32_ntp_gettime_ar
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
};
check_syscall_args(compat_30_netbsd32_ntp_gettime)
+#if defined(NTP) || !defined(_KERNEL_OPT)
struct netbsd32_ntp_adjtime_args {
syscallarg(netbsd32_timexp_t) tp;
};
check_syscall_args(netbsd32_ntp_adjtime)
+#else
+#endif
struct netbsd32_setgid_args {
syscallarg(gid_t) gid;
@@ -2923,8 +2926,11 @@ int netbsd32_pwrite(struct lwp *, const
int compat_30_netbsd32_ntp_gettime(struct lwp *, const struct compat_30_netbsd32_ntp_gettime_args *, register_t *);
+#if defined(NTP) || !defined(_KERNEL_OPT)
int netbsd32_ntp_adjtime(struct lwp *, const struct netbsd32_ntp_adjtime_args *, register_t *);
+#else
+#endif
int netbsd32_setgid(struct lwp *, const struct netbsd32_setgid_args *, register_t *);
int netbsd32_setegid(struct lwp *, const struct netbsd32_setegid_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.16
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Sep 29 04:24:02 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.16 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.15
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:22:31 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Only keep the compat syscall entry; the main entry needs to remain
conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.18 -r1.120.2.19 \
src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.18 src/sys/compat/netbsd32/syscalls.master:1.120.2.19
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.18 Sat Sep 29 04:11:06 2018
+++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:22:31 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -419,7 +419,11 @@
175 COMPAT_30 MODULAR compat_netbsd32_30 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
+#if defined(NTP) || !defined(_KERNEL_OPT)
176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); }
+#else
+176 EXCL ntp_adjtime
+#endif
177 UNIMPL
178 UNIMPL
179 UNIMPL
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:11:45 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.13 -r1.13.2.14 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.13 -r1.24.2.14 \
src/sys/compat/netbsd32/netbsd32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:11:45 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -479,17 +479,12 @@
/* syscall: "netbsd32_pwrite" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_off_t" */
#define NETBSD32_SYS_netbsd32_pwrite 174
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175
/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
#define NETBSD32_SYS_netbsd32_ntp_adjtime 176
-#else
-/* 175 is excluded ntp_gettime */
-/* 176 is excluded ntp_adjtime */
-#endif
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
@@ -1032,13 +1027,9 @@
/* syscall: "compat_30_netbsd32___fhstat30" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_stat50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32___fhstat30 392
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32_ntp_gettime 393
-#else
-/* 393 is excluded __ntp_gettime30 */
-#endif
/* syscall: "netbsd32___socket30" ret: "int" args: "int" "int" "int" */
#define NETBSD32_SYS_netbsd32___socket30 394
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:11:45 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -908,7 +908,6 @@ struct netbsd32_pwrite_args {
syscallarg(netbsd32_off_t) offset;
};
check_syscall_args(netbsd32_pwrite)
-#if defined(NTP) || !defined(_KERNEL_OPT)
struct compat_30_netbsd32_ntp_gettime_args {
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
@@ -919,8 +918,6 @@ struct netbsd32_ntp_adjtime_args {
syscallarg(netbsd32_timexp_t) tp;
};
check_syscall_args(netbsd32_ntp_adjtime)
-#else
-#endif
struct netbsd32_setgid_args {
syscallarg(gid_t) gid;
@@ -2053,14 +2050,11 @@ struct compat_30_netbsd32___fhstat30_arg
syscallarg(netbsd32_stat50p_t) sb;
};
check_syscall_args(compat_30_netbsd32___fhstat30)
-#if defined(NTP) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32_ntp_gettime_args {
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
};
check_syscall_args(compat_50_netbsd32_ntp_gettime)
-#else
-#endif
struct netbsd32___socket30_args {
syscallarg(int) domain;
@@ -2927,13 +2921,10 @@ int netbsd32_pread(struct lwp *, const s
int netbsd32_pwrite(struct lwp *,
CVS commit: [pgoyette-compat] src/sys/compat/netbsd32
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 04:11:07 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: syscalls.master
Log Message:
Don't #ifdef out the NTP compat calls.
The syscall number needs to be defined (for the autoload table) whether
or not the compat code is built in. The compat code will be included
in the module in all cases, but it makes explicit checks to ensure that
NTP code exists before executing.
To generate a diff of this commit:
cvs rdiff -u -r1.120.2.17 -r1.120.2.18 \
src/sys/compat/netbsd32/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.120.2.17 src/sys/compat/netbsd32/syscalls.master:1.120.2.18
--- src/sys/compat/netbsd32/syscalls.master:1.120.2.17 Fri Sep 14 10:41:13 2018
+++ src/sys/compat/netbsd32/syscalls.master Sat Sep 29 04:11:06 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -416,15 +416,10 @@
174 STD { netbsd32_ssize_t|netbsd32||pwrite(int fd, \
netbsd32_voidp buf, netbsd32_size_t nbyte, \
int PAD, netbsd32_off_t offset); }
-#if defined(NTP) || !defined(_KERNEL_OPT)
175 COMPAT_30 MODULAR compat_netbsd32_30 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
176 STD { int|netbsd32||ntp_adjtime(netbsd32_timexp_t tp); }
-#else
-175 EXCL ntp_gettime
-176 EXCL ntp_adjtime
-#endif
177 UNIMPL
178 UNIMPL
179 UNIMPL
@@ -899,13 +894,9 @@
{ int|netbsd32|30|fhstat( \
netbsd32_fhandlep_t fhp, \
netbsd32_stat50p_t sb); }
-#if defined(NTP) || !defined(_KERNEL_OPT)
393 COMPAT_50 MODULAR compat_netbsd32_50 \
{ int|netbsd32||ntp_gettime( \
netbsd32_ntptimeval50p_t ntvp); }
-#else
-393 EXCL __ntp_gettime30
-#endif
394 STD { int|netbsd32|30|socket(int domain, int type, \
int protocol); }
395 STD { int|netbsd32|30|getfh(netbsd32_charp fname, \
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:30:10 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: sunos_syscall.h
sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.96.2.2 -r1.96.2.3 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.80.2.2 -r1.80.2.3 src/sys/compat/sunos/sunos_syscallargs.h
cvs rdiff -u -r1.95.2.2 -r1.95.2.3 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.91.2.2 -r1.91.2.3 src/sys/compat/sunos/sunos_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.96.2.2 src/sys/compat/sunos/sunos_syscall.h:1.96.2.3
--- src/sys/compat/sunos/sunos_syscall.h:1.96.2.2 Sat Sep 29 02:06:46 2018
+++ src/sys/compat/sunos/sunos_syscall.h Sat Sep 29 02:30:09 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.96.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.96.2.3 2018/09/29 02:30:09 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALL_H_
@@ -402,19 +402,19 @@
/* syscall: "ustat" ret: "int" args: "int" "struct sunos_ustat *" */
#define SUNOS_SYS_ustat 168
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
/* syscall: "semsys" ret: "int" args: "int" "int" "int" "int" "int" */
#define SUNOS_SYS_semsys 169
#else
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
/* syscall: "msgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
#define SUNOS_SYS_msgsys 170
#else
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
/* syscall: "shmsys" ret: "int" args: "int" "int" "int" "int" */
#define SUNOS_SYS_shmsys 171
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.2 src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.3
--- src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.2 Sat Sep 29 02:06:46 2018
+++ src/sys/compat/sunos/sunos_syscallargs.h Sat Sep 29 02:30:09 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.80.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.80.2.3 2018/09/29 02:30:09 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -404,17 +404,17 @@ struct sunos_sys_ustat_args {
syscallarg(struct sunos_ustat *) buf;
};
check_syscall_args(sunos_sys_ustat)
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
struct compat_10_sys_semsys_args;
#else
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
struct compat_10_sys_msgsys_args;
#else
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
struct compat_10_sys_shmsys_args;
#else
@@ -716,17 +716,17 @@ int sunos_sys_mount(struct lwp *, const
int sunos_sys_ustat(struct lwp *, const struct sunos_sys_ustat_args *, register_t *);
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
int compat_10_sys_semsys(struct lwp *, const struct compat_10_sys_semsys_args *, register_t *);
#else
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
int compat_10_sys_msgsys(struct lwp *, const struct compat_10_sys_msgsys_args *, register_t *);
#else
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
int compat_10_sys_shmsys(struct lwp *, const struct compat_10_sys_shmsys_args *, register_t *);
#else
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.95.2.2 src/sys/compat/sunos/sunos_syscalls.c:1.95.2.3
--- src/sys/compat/sunos/sunos_syscalls.c:1.95.2.2 Sat Sep 29 02:06:46 2018
+++ src/sys/compat/sunos/sunos_syscalls.c Sat Sep 29 02:30:09 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.95.2.3 2018/09/29 02:30:09 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.3 2018/09/29 02:30:09 pgoyette Exp $");
#if
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:29:42 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize the compat_10 sysv ipc syscalls on both the COMPAT_10
and SYSVxxx attributes
To generate a diff of this commit:
cvs rdiff -u -r1.80.2.1 -r1.80.2.2 src/sys/compat/sunos/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/sunos/syscalls.master
diff -u src/sys/compat/sunos/syscalls.master:1.80.2.1 src/sys/compat/sunos/syscalls.master:1.80.2.2
--- src/sys/compat/sunos/syscalls.master:1.80.2.1 Sat Sep 29 02:06:14 2018
+++ src/sys/compat/sunos/syscalls.master Sat Sep 29 02:29:42 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp $
+ $NetBSD: syscalls.master,v 1.80.2.2 2018/09/29 02:29:42 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -276,19 +276,19 @@
int flags, void *data); }
168 STD { int|sunos_sys||ustat(int dev, \
struct sunos_ustat *buf); }
-#ifdef SYSVSEM
+#if defined(SYSVSEM) && defined(COMPAT_10)
169 NOARGS { int|compat_10_sys||semsys(int which, int a2, int a3, \
int a4, int a5); }
#else
169 UNIMPL semsys
#endif
-#ifdef SYSVMSG
+#if defined(SYSVMSG) && defined(COMPAT_10)
170 NOARGS { int|compat_10_sys||msgsys(int which, int a2, int a3, \
int a4, int a5, int a6); }
#else
170 UNIMPL msgsys
#endif
-#ifdef SYSVSHM
+#if defined(SYSVSHM) && defined(COMPAT_10)
171 NOARGS { int|compat_10_sys||shmsys(int which, int a2, int a3, \
int a4); }
#else
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:06:14 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize compat_09 syscalls
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.2.1 src/sys/compat/sunos/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/sunos/syscalls.master
diff -u src/sys/compat/sunos/syscalls.master:1.80 src/sys/compat/sunos/syscalls.master:1.80.2.1
--- src/sys/compat/sunos/syscalls.master:1.80 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/sunos/syscalls.master Sat Sep 29 02:06:14 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -259,10 +259,15 @@
159 STD { int|sunos_sys||unmount(char *path); }
160 NOARGS { int|async||daemon(void); }
161 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
+#ifdef COMPAT_09
162 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
163 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
int len); }
+#else
+162 UNIMPL compat_09_sys_getdomainname
+163 UNIMPL compat_09_sys_setdomainname
+#endif
164 UNIMPL rtschedule
165 STD { int|sunos_sys||quotactl(int cmd, char *special, \
int uid, void *addr); }
CVS commit: [pgoyette-compat] src/sys/compat/sunos
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 02:06:46 UTC 2018
Modified Files:
src/sys/compat/sunos [pgoyette-compat]: sunos_syscall.h
sunos_syscallargs.h sunos_syscalls.c sunos_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.96.2.1 -r1.96.2.2 src/sys/compat/sunos/sunos_syscall.h
cvs rdiff -u -r1.80.2.1 -r1.80.2.2 src/sys/compat/sunos/sunos_syscallargs.h
cvs rdiff -u -r1.95.2.1 -r1.95.2.2 src/sys/compat/sunos/sunos_syscalls.c
cvs rdiff -u -r1.91.2.1 -r1.91.2.2 src/sys/compat/sunos/sunos_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/sunos/sunos_syscall.h
diff -u src/sys/compat/sunos/sunos_syscall.h:1.96.2.1 src/sys/compat/sunos/sunos_syscall.h:1.96.2.2
--- src/sys/compat/sunos/sunos_syscall.h:1.96.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/sunos/sunos_syscall.h Sat Sep 29 02:06:46 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscall.h,v 1.96.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: sunos_syscall.h,v 1.96.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALL_H_
@@ -381,12 +381,15 @@
/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
#define SUNOS_SYS_getfh 161
+#ifdef COMPAT_09
/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
#define SUNOS_SYS_getdomainname 162
/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
#define SUNOS_SYS_setdomainname 163
+#else
+#endif
/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */
#define SUNOS_SYS_quotactl 165
Index: src/sys/compat/sunos/sunos_syscallargs.h
diff -u src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.1 src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.2
--- src/sys/compat/sunos/sunos_syscallargs.h:1.80.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/sunos/sunos_syscallargs.h Sat Sep 29 02:06:46 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: sunos_syscallargs.h,v 1.80.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: sunos_syscallargs.h,v 1.80.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
*/
#ifndef _SUNOS_SYS_SYSCALLARGS_H_
@@ -369,10 +369,13 @@ struct sunos_sys_unmount_args {
check_syscall_args(sunos_sys_unmount)
struct compat_30_sys_getfh_args;
+#ifdef COMPAT_09
struct compat_09_sys_getdomainname_args;
struct compat_09_sys_setdomainname_args;
+#else
+#endif
struct sunos_sys_quotactl_args {
syscallarg(int) cmd;
@@ -698,10 +701,13 @@ int async_daemon(struct lwp *, const voi
int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *);
+#ifdef COMPAT_09
int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *);
int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *);
+#else
+#endif
int sunos_sys_quotactl(struct lwp *, const struct sunos_sys_quotactl_args *, register_t *);
int sunos_sys_exportfs(struct lwp *, const struct sunos_sys_exportfs_args *, register_t *);
Index: src/sys/compat/sunos/sunos_syscalls.c
diff -u src/sys/compat/sunos/sunos_syscalls.c:1.95.2.1 src/sys/compat/sunos/sunos_syscalls.c:1.95.2.2
--- src/sys/compat/sunos/sunos_syscalls.c:1.95.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/sunos/sunos_syscalls.c Sat Sep 29 02:06:46 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: sunos_syscalls.c,v 1.95.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.80 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.80.2.1 2018/09/29 02:06:14 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.1 2018/09/06 06:55:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_syscalls.c,v 1.95.2.2 2018/09/29 02:06:46 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -190,8 +190,13 @@ const char *const sunos_syscallnames[] =
/* 159 */ "unmount",
/* 160 */ "async_daemon",
/* 161 */ "getfh",
+#ifdef COMPAT_09
/* 162 */ "getdomainname",
/* 163 */ "setdomainname",
+#else
+ /* 162 */ "#162 (unimplemented compat_09_sys_getdomainname)",
+ /* 163 */ "#163 (unimplemented compat_09_sys_setdomainname)",
+#endif
/* 164 */ "#164
CVS commit: [pgoyette-compat] src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:45:32 UTC 2018
Modified Files:
src/sys/compat/ultrix [pgoyette-compat]: ultrix_syscall.h
ultrix_syscallargs.h ultrix_syscalls.c ultrix_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.72.2.1 -r1.72.2.2 src/sys/compat/ultrix/ultrix_syscall.h
cvs rdiff -u -r1.67.2.1 -r1.67.2.2 src/sys/compat/ultrix/ultrix_syscallargs.h
cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/sys/compat/ultrix/ultrix_syscalls.c
cvs rdiff -u -r1.74.2.1 -r1.74.2.2 src/sys/compat/ultrix/ultrix_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ultrix/ultrix_syscall.h
diff -u src/sys/compat/ultrix/ultrix_syscall.h:1.72.2.1 src/sys/compat/ultrix/ultrix_syscall.h:1.72.2.2
--- src/sys/compat/ultrix/ultrix_syscall.h:1.72.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/ultrix/ultrix_syscall.h Sat Sep 29 01:45:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscall.h,v 1.72.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscall.h,v 1.72.2.2 2018/09/29 01:45:32 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALL_H_
@@ -387,12 +387,15 @@
/* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
#define ULTRIX_SYS_getfh 164
+#if defined(COMPAT_09)
/* syscall: "getdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_getdomainname 165
/* syscall: "setdomainname" ret: "int" args: "char *" "int" */
#define ULTRIX_SYS_setdomainname 166
+#else
+#endif
/* syscall: "quotactl" ret: "int" args: "int" "char *" "int" "void *" */
#define ULTRIX_SYS_quotactl 168
Index: src/sys/compat/ultrix/ultrix_syscallargs.h
diff -u src/sys/compat/ultrix/ultrix_syscallargs.h:1.67.2.1 src/sys/compat/ultrix/ultrix_syscallargs.h:1.67.2.2
--- src/sys/compat/ultrix/ultrix_syscallargs.h:1.67.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/ultrix/ultrix_syscallargs.h Sat Sep 29 01:45:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: ultrix_syscallargs.h,v 1.67.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscallargs.h,v 1.67.2.2 2018/09/29 01:45:32 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
*/
#ifndef _ULTRIX_SYS_SYSCALLARGS_H_
@@ -357,10 +357,13 @@ struct ultrix_sys_fstatfs_args {
check_syscall_args(ultrix_sys_fstatfs)
struct compat_30_sys_getfh_args;
+#if defined(COMPAT_09)
struct compat_09_sys_getdomainname_args;
struct compat_09_sys_setdomainname_args;
+#else
+#endif
struct ultrix_sys_quotactl_args {
syscallarg(int) cmd;
@@ -675,10 +678,13 @@ int ultrix_sys_fstatfs(struct lwp *, con
int compat_30_sys_getfh(struct lwp *, const struct compat_30_sys_getfh_args *, register_t *);
+#if defined(COMPAT_09)
int compat_09_sys_getdomainname(struct lwp *, const struct compat_09_sys_getdomainname_args *, register_t *);
int compat_09_sys_setdomainname(struct lwp *, const struct compat_09_sys_setdomainname_args *, register_t *);
+#else
+#endif
int ultrix_sys_quotactl(struct lwp *, const struct ultrix_sys_quotactl_args *, register_t *);
int ultrix_sys_exportfs(struct lwp *, const struct ultrix_sys_exportfs_args *, register_t *);
Index: src/sys/compat/ultrix/ultrix_syscalls.c
diff -u src/sys/compat/ultrix/ultrix_syscalls.c:1.71.2.1 src/sys/compat/ultrix/ultrix_syscalls.c:1.71.2.2
--- src/sys/compat/ultrix/ultrix_syscalls.c:1.71.2.1 Thu Sep 6 06:55:47 2018
+++ src/sys/compat/ultrix/ultrix_syscalls.c Sat Sep 29 01:45:32 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: ultrix_syscalls.c,v 1.71.2.1 2018/09/06 06:55:47 pgoyette Exp $ */
+/* $NetBSD: ultrix_syscalls.c,v 1.71.2.2 2018/09/29 01:45:32 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.71.2.1 2018/09/06 06:55:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_syscalls.c,v 1.71.2.2 2018/09/29 01:45:32 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include
@@ -193,8 +193,13 @@ const char *const ultrix_syscallnames[]
/* 162 */ "#162 (unimplemented umount)",
/* 163 */ "#163 (unimplemented async_daemon)",
/* 164 */ "getfh",
+#if defined(COMPAT_09)
/* 165 */ "getdomainname",
/* 166 */ "setdomainname",
+#else
+ /* 165 */ "#165 (unimplemented
CVS commit: [pgoyette-compat] src/sys/compat/ultrix
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:45:05 UTC 2018
Modified Files:
src/sys/compat/ultrix [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize compat_09_sys_{get,set}domainname syscalls appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/compat/ultrix/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/ultrix/syscalls.master
diff -u src/sys/compat/ultrix/syscalls.master:1.56 src/sys/compat/ultrix/syscalls.master:1.56.2.1
--- src/sys/compat/ultrix/syscalls.master:1.56 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/ultrix/syscalls.master Sat Sep 29 01:45:05 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.56 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.56.2.1 2018/09/29 01:45:05 pgoyette Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -255,10 +255,15 @@
162 UNIMPL umount
163 UNIMPL async_daemon
164 NOARGS { int|compat_30_sys||getfh(char *fname, fhandle_t *fhp); }
+#if defined(COMPAT_09)
165 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); }
166 NOARGS { int|compat_09_sys||setdomainname(char *domainname, \
int len); }
+#else
+165 UNIMPL compat_09_sys_getdomainname
+166 UNIMPL compat_09_sys_setdomainname
+#endif
167 UNIMPL
168 STD { int|ultrix_sys||quotactl(int cmd, char *special, \
int uid, void *addr); }
CVS commit: [pgoyette-compat] src/sys/compat/aoutm68k
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:38:32 UTC 2018
Modified Files:
src/sys/compat/aoutm68k [pgoyette-compat]: aoutm68k_syscall.h
aoutm68k_syscallargs.h aoutm68k_syscalls.c aoutm68k_sysent.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.52.2.1 -r1.52.2.2 src/sys/compat/aoutm68k/aoutm68k_syscall.h
cvs rdiff -u -r1.50.2.1 -r1.50.2.2 \
src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
cvs rdiff -u -r1.49.2.1 -r1.49.2.2 \
src/sys/compat/aoutm68k/aoutm68k_syscalls.c
cvs rdiff -u -r1.54.2.1 -r1.54.2.2 src/sys/compat/aoutm68k/aoutm68k_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/aoutm68k/aoutm68k_syscall.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52.2.1 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52.2.2
--- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.52.2.1 Thu Sep 6 06:55:45 2018
+++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Sat Sep 29 01:38:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: aoutm68k_syscall.h,v 1.52.2.1 2018/09/06 06:55:45 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscall.h,v 1.52.2.2 2018/09/29 01:38:32 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
*/
#ifndef _AOUTM68K_SYS_SYSCALL_H_
@@ -352,9 +352,13 @@
/* syscall: "setpriority" ret: "int" args: "int" "int" "int" */
#define AOUTM68K_SYS_setpriority 96
+#if defined(COMPAT_30) || !defined(_KERNEL)
/* syscall: "socket" ret: "int" args: "int" "int" "int" */
#define AOUTM68K_SYS_socket 97
+#else
+/* 97 is excluded compat_30_sys_socket */
+#endif
/* syscall: "connect" ret: "int" args: "int" "const struct sockaddr *" "int" */
#define AOUTM68K_SYS_connect 98
@@ -580,9 +584,13 @@
#else
/* 158 is excluded compat_20_sys_statfs */
#endif
+#if defined(COMPAT_30) || !defined(_KERNEL)
/* syscall: "getfh" ret: "int" args: "const char *" "struct compat_30_fhandle *" */
#define AOUTM68K_SYS_getfh 161
+#else
+/* 161 is excluded compat_30_sys_getfh */
+#endif
#if defined(COMPAT_09) || !defined(_KERNEL)
/* syscall: "ogetdomainname" ret: "int" args: "char *" "int" */
#define AOUTM68K_SYS_ogetdomainname 162
@@ -908,9 +916,13 @@
/* syscall: "fchroot" ret: "int" args: "int" */
#define AOUTM68K_SYS_fchroot 297
+#if defined(COMPAT_30) || ! defined(_KERNEL)
/* syscall: "fhopen" ret: "int" args: "const struct compat_30_fhandle *" "int" */
#define AOUTM68K_SYS_fhopen 298
+#else
+/* 298 is excluded compat_30_sys_fhopen */
+#endif
/* syscall: "fhstat" ret: "int" args: "const struct compat_30_fhandle *" "struct aoutm68k_stat *" */
#define AOUTM68K_SYS_fhstat 299
Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50.2.1 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50.2.2
--- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.50.2.1 Thu Sep 6 06:55:45 2018
+++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Sat Sep 29 01:38:32 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: aoutm68k_syscallargs.h,v 1.50.2.1 2018/09/06 06:55:45 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscallargs.h,v 1.50.2.2 2018/09/29 01:38:32 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
*/
#ifndef _AOUTM68K_SYS_SYSCALLARGS_H_
@@ -239,8 +239,11 @@ struct compat_50_sys_select_args;
struct sys_fsync_args;
struct sys_setpriority_args;
+#if defined(COMPAT_30) || !defined(_KERNEL)
struct compat_30_sys_socket_args;
+#else
+#endif
struct sys_connect_args;
#if defined(COMPAT_43) || !defined(_KERNEL)
@@ -378,8 +381,11 @@ struct compat_20_sys_statfs_args;
struct compat_20_sys_fstatfs_args;
#else
#endif
+#if defined(COMPAT_30) || !defined(_KERNEL)
struct compat_30_sys_getfh_args;
+#else
+#endif
#if defined(COMPAT_09) || !defined(_KERNEL)
struct compat_09_sys_getdomainname_args;
@@ -611,8 +617,11 @@ struct compat_16_sys___sigreturn14_args;
struct sys___getcwd_args;
struct sys_fchroot_args;
+#if defined(COMPAT_30) || ! defined(_KERNEL)
struct compat_30_sys_fhopen_args;
+#else
+#endif
struct aoutm68k_sys_fhstat_args {
syscallarg(const struct compat_30_fhandle *) fhp;
@@ -874,8 +883,11 @@ int sys_fsync(struct lwp *, const struct
int sys_setpriority(struct lwp *, const struct sys_setpriority_args *, register_t *);
+#if defined(COMPAT_30) || !defined(_KERNEL)
int compat_30_sys_socket(struct lwp *, const struct compat_30_sys_socket_args *, register_t *);
+#else
+#endif
int sys_connect(struct lwp *, const struct
CVS commit: [pgoyette-compat] src/sys/compat/aoutm68k
Module Name:src
Committed By: pgoyette
Date: Sat Sep 29 01:37:26 UTC 2018
Modified Files:
src/sys/compat/aoutm68k [pgoyette-compat]: syscalls.master
Log Message:
Conditionalize some compat_30 syscalls appropriately
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.2.1 src/sys/compat/aoutm68k/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/aoutm68k/syscalls.master
diff -u src/sys/compat/aoutm68k/syscalls.master:1.41 src/sys/compat/aoutm68k/syscalls.master:1.41.2.1
--- src/sys/compat/aoutm68k/syscalls.master:1.41 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/aoutm68k/syscalls.master Sat Sep 29 01:37:26 2018
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.41 2018/01/06 16:41:23 kamil Exp $
+ $NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -271,7 +271,11 @@
94 UNIMPL setdopt
95 NOARGS { int|sys||fsync(int fd); }
96 NOARGS { int|sys||setpriority(int which, int who, int prio); }
+#if defined(COMPAT_30) || !defined(_KERNEL)
97 NOARGS { int|compat_30_sys||socket(int domain, int type, int protocol); }
+#else
+97 EXCL compat_30_sys_socket
+#endif
98 NOARGS { int|sys||connect(int s, const struct sockaddr *name, \
int namelen); }
#if defined(COMPAT_43) || !defined(_KERNEL)
@@ -442,8 +446,12 @@
#endif
159 UNIMPL
160 UNIMPL
+#if defined(COMPAT_30) || !defined(_KERNEL)
161 NOARGS { int|compat_30_sys||getfh(const char *fname, \
struct compat_30_fhandle *fhp); }
+#else
+161 EXCL compat_30_sys_getfh
+#endif
#if defined(COMPAT_09) || !defined(_KERNEL)
162 NOARGS { int|compat_09_sys||getdomainname(char *domainname, \
int len); } ogetdomainname
@@ -726,8 +734,12 @@
#endif
296 NOARGS { int|sys||__getcwd(char *bufp, size_t length); }
297 NOARGS { int|sys||fchroot(int fd); }
+#if defined(COMPAT_30) || ! defined(_KERNEL)
298 NOARGS { int|compat_30_sys||fhopen(const \
struct compat_30_fhandle *fhp, int flags); }
+#else
+298 EXCL compat_30_sys_fhopen
+#endif
299 STD { int|aoutm68k_sys||fhstat(const struct \
compat_30_fhandle *fhp, \
struct aoutm68k_stat *sb); }
CVS commit: src/etc
Module Name:src
Committed By: kre
Date: Sat Sep 29 01:12:22 UTC 2018
Modified Files:
src/etc: Makefile
Log Message:
Only test USE_XZ_SETS if it is defined. This is probably not the
correct fix, so someone else please do it correctly - either this is
the wrong word, or it should be given a default value elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.434 -r1.435 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.434 src/etc/Makefile:1.435
--- src/etc/Makefile:1.434 Fri Sep 28 15:11:36 2018
+++ src/etc/Makefile Sat Sep 29 01:12:22 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.434 2018/09/28 15:11:36 martin Exp $
+# $NetBSD: Makefile,v 1.435 2018/09/29 01:12:22 kre Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -410,7 +410,7 @@ install-obsolete-lists: .PHONY .MAKE
distrib-dirs: .PHONY check_DESTDIR
cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
-.if ${USE_XZ_SETS} != "no"
+.if defined(USE_XZ_SETS) && ${USE_XZ_SETS} != "no"
COMPRESS_PROGRAM=${TOOL_XZ}
XZ_OPT=-9
TAR_SUFF=tar.xz
CVS commit: src/tests/crypto/libcrypto
Module Name:src
Committed By: christos
Date: Fri Sep 28 23:40:45 UTC 2018
Modified Files:
src/tests/crypto/libcrypto: Makefile.inc
Log Message:
Force libcrypto to be loaded after libcryptotest for the benefit of sun2
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/crypto/libcrypto/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/crypto/libcrypto/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.9 src/tests/crypto/libcrypto/Makefile.inc:1.10
--- src/tests/crypto/libcrypto/Makefile.inc:1.9 Sun Sep 23 09:34:57 2018
+++ src/tests/crypto/libcrypto/Makefile.inc Fri Sep 28 19:40:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2018/09/23 13:34:57 christos Exp $
+# $NetBSD: Makefile.inc,v 1.10 2018/09/28 23:40:45 christos Exp $
.include
.include "../Makefile.inc"
@@ -13,9 +13,6 @@ SRCS= ${HELPER_SRCS}
MAN= # empty
BINDIR= ${TESTSDIR}
-DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
-LDADD+= -lcrypto -lcrypt
-
CWARNFLAGS.clang+= -Wno-format
CPPFLAGS+= -DOPENSSL_FIPS
@@ -30,6 +27,10 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
.PATH: ${OPENSSLSRC}/crypto/${HELPER_DIR}
.endif
PROGDPLIBS+= cryptotest ${OPENSSLSRC}/../lib/libcryptotest
+PROGDPLIBS+= crypto ${OPENSSLSRC}/../lib/libcrypto
+DPADD+= ${LIBCRYPT}
+LDADD+= -lcrypt
+
.include
.include
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: aymeric
Date: Fri Sep 28 21:51:42 UTC 2018
Modified Files:
src/sys/dev/ic: dwc_gmac.c dwc_gmac_reg.h dwc_gmac_var.h
Log Message:
Revert the recent support for enhanced descriptors until a viable solution is
found.
It broke at least Cubietruck, Orange Pi One, and maybe Rock64 ethernets in
different ways. Unfortunately it works on my Olinuxino Micro and Lime 2 so I
can't reproduce the bugs for now.
Should fix PR#53637
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/dwc_gmac.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/dwc_gmac_reg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/dwc_gmac_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.53 src/sys/dev/ic/dwc_gmac.c:1.54
--- src/sys/dev/ic/dwc_gmac.c:1.53 Mon Sep 17 20:25:49 2018
+++ src/sys/dev/ic/dwc_gmac.c Fri Sep 28 21:51:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.53 2018/09/17 20:25:49 aymeric Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.54 2018/09/28 21:51:42 aymeric Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.53 2018/09/17 20:25:49 aymeric Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dwc_gmac.c,v 1.54 2018/09/28 21:51:42 aymeric Exp $");
/* #define DWC_GMAC_DEBUG 1 */
@@ -100,53 +100,6 @@ static void dwc_gmac_rx_intr(struct dwc_
static void dwc_gmac_setmulti(struct dwc_gmac_softc *sc);
static int dwc_gmac_ifflags_cb(struct ethercom *);
static uint32_t bitrev32(uint32_t x);
-static void dwc_gmac_desc_set_owned_by_dev(struct dwc_gmac_dev_dmadesc *);
-static int dwc_gmac_desc_is_owned_by_dev(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_std_set_len(struct dwc_gmac_dev_dmadesc *, int);
-static int dwc_gmac_desc_std_get_len(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_std_tx_init_flags(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_std_tx_set_first_frag(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_std_tx_set_last_frag(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_std_rx_init_flags(struct dwc_gmac_dev_dmadesc *);
-static int dwc_gmac_desc_std_rx_has_error(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_enh_set_len(struct dwc_gmac_dev_dmadesc *, int);
-static int dwc_gmac_desc_enh_get_len(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_enh_tx_init_flags(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_enh_tx_set_first_frag(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_enh_tx_set_last_frag(struct dwc_gmac_dev_dmadesc *);
-static void dwc_gmac_desc_enh_rx_init_flags(struct dwc_gmac_dev_dmadesc *);
-static int dwc_gmac_desc_enh_rx_has_error(struct dwc_gmac_dev_dmadesc *);
-
-static const struct dwc_gmac_desc_methods desc_methods_standard = {
- .tx_init_flags = dwc_gmac_desc_std_tx_init_flags,
- .tx_set_owned_by_dev = dwc_gmac_desc_set_owned_by_dev,
- .tx_is_owned_by_dev = dwc_gmac_desc_is_owned_by_dev,
- .tx_set_len = dwc_gmac_desc_std_set_len,
- .tx_set_first_frag = dwc_gmac_desc_std_tx_set_first_frag,
- .tx_set_last_frag = dwc_gmac_desc_std_tx_set_last_frag,
- .rx_init_flags = dwc_gmac_desc_std_rx_init_flags,
- .rx_set_owned_by_dev = dwc_gmac_desc_set_owned_by_dev,
- .rx_is_owned_by_dev = dwc_gmac_desc_is_owned_by_dev,
- .rx_set_len = dwc_gmac_desc_std_set_len,
- .rx_get_len = dwc_gmac_desc_std_get_len,
- .rx_has_error = dwc_gmac_desc_std_rx_has_error
-};
-
-static const struct dwc_gmac_desc_methods desc_methods_enhanced = {
- .tx_init_flags = dwc_gmac_desc_enh_tx_init_flags,
- .tx_set_owned_by_dev = dwc_gmac_desc_set_owned_by_dev,
- .tx_is_owned_by_dev = dwc_gmac_desc_is_owned_by_dev,
- .tx_set_len = dwc_gmac_desc_enh_set_len,
- .tx_set_first_frag = dwc_gmac_desc_enh_tx_set_first_frag,
- .tx_set_last_frag = dwc_gmac_desc_enh_tx_set_last_frag,
- .rx_init_flags = dwc_gmac_desc_enh_rx_init_flags,
- .rx_set_owned_by_dev = dwc_gmac_desc_set_owned_by_dev,
- .rx_is_owned_by_dev = dwc_gmac_desc_is_owned_by_dev,
- .rx_set_len = dwc_gmac_desc_enh_set_len,
- .rx_get_len = dwc_gmac_desc_enh_get_len,
- .rx_has_error = dwc_gmac_desc_enh_rx_has_error
-};
-
#define TX_DESC_OFFSET(N) ((AWGE_RX_RING_COUNT+(N)) \
*sizeof(struct dwc_gmac_dev_dmadesc))
@@ -169,7 +122,7 @@ static const struct dwc_gmac_desc_method
#define AWIN_DEF_MAC_INTRMASK \
(AWIN_GMAC_MAC_INT_TSI | AWIN_GMAC_MAC_INT_ANEG | \
- AWIN_GMAC_MAC_INT_LINKCHG)
+ AWIN_GMAC_MAC_INT_LINKCHG | AWIN_GMAC_MAC_INT_RGSMII)
#ifdef DWC_GMAC_DEBUG
static void dwc_gmac_dump_dma(struct dwc_gmac_softc *sc);
@@ -241,12 +194,6 @@ dwc_gmac_attach(struct dwc_gmac_softc *s
aprint_normal_dev(sc->sc_dev, "Ethernet address %s\n",
ether_sprintf(enaddr));
- if (bus_space_read_4(sc->sc_bst, sc->sc_bsh, AWIN_GMAC_DMA_HWFEATURES) &
-
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64
Module Name:src Committed By: christos Date: Fri Sep 28 17:28:01 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc Log Message: fix build To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.2 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.1 Sun Sep 23 09:33:05 2018 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc Fri Sep 28 13:28:01 2018 @@ -5,5 +5,4 @@ x25519-ppc64.S ECCPPFLAGS+= -DX25519_ASM -ECNI = yes .include "../../ec.inc"
CVS commit: src/etc
Module Name:src
Committed By: martin
Date: Fri Sep 28 15:11:36 UTC 2018
Modified Files:
src/etc: Makefile
Log Message:
Prepare for .tar.xz sets
To generate a diff of this commit:
cvs rdiff -u -r1.433 -r1.434 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.433 src/etc/Makefile:1.434
--- src/etc/Makefile:1.433 Sun Apr 1 04:35:02 2018
+++ src/etc/Makefile Fri Sep 28 15:11:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.433 2018/04/01 04:35:02 ryo Exp $
+# $NetBSD: Makefile,v 1.434 2018/09/28 15:11:36 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -410,6 +410,14 @@ install-obsolete-lists: .PHONY .MAKE
distrib-dirs: .PHONY check_DESTDIR
cd ${NETBSDSRCDIR}/etc/mtree && ${MAKE} distrib-dirs
+.if ${USE_XZ_SETS} != "no"
+COMPRESS_PROGRAM=${TOOL_XZ}
+XZ_OPT=-9
+TAR_SUFF=tar.xz
+.else
+COMPRESS_PROGRAM=${TOOL_GZIP}
+TAR_SUFF=tgz
+.endif
# release, snapshot --
# Build a full distribution including kernels & install media.
@@ -417,7 +425,7 @@ distrib-dirs: .PHONY check_DESTDIR
release snapshot: .PHONY .MAKE check_DESTDIR check_RELEASEDIR snap_md_post
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib/sets sets
${MAKESUMS} -A -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets \
- ${KERNEL_SETS:@.SETS.@kern-${.SETS.}.tgz@}
+ ${KERNEL_SETS:@.SETS.@kern-${.SETS.}.${TAR_SUFF}@}
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel '*.gz'
@@ -543,7 +551,7 @@ snap_post: .PHONY .MAKE build_kernelsets
#kern-${kernel}.tgz. These kernels
#are also placed in the binary/kernel
#area of the release package as
-#netbsd-${kernel}.gz.
+#netbsd-${kernel}.gz (or .tar.xz).
#
# EXTRA_KERNELS Additional kernels to place in the
#binary/kernel area of the release
@@ -609,8 +617,8 @@ kernset-${configfile}: .PHONY build_kern
@kernlist=$$(${GETKERNELAWK} ${KERNCONFDIR}/${configfile}); \
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes="${KERNEL_SUFFIXES:S/^/./}"; \
- kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
- pax_cmd="GZIP=${GZIP_FLAGS:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${TOOL_GZIP:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
+ kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.${TAR_SUFF}; \
+ pax_cmd="GZIP=${GZIP_FLAGS:Q} XZ_OPT=${XZ_OPT:Q} ${TOOL_PAX} ${PAX_TIMESTAMP} --use-compress-program ${COMPRESS_PROGRAM:Q} -O -w -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}"; \
cd $${kerndir} && { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
CVS commit: src/distrib
Module Name:src Committed By: martin Date: Fri Sep 28 15:05:23 UTC 2018 Modified Files: src/distrib/acorn32/cdroms/installcd: Makefile src/distrib/alpha/cdroms/installcd: Makefile src/distrib/amd64/cdroms/installcd: Makefile src/distrib/amiga/cdroms/installcd: Makefile src/distrib/arc/cdroms/installcd: Makefile src/distrib/atari/cdroms/installcd: Makefile src/distrib/cats/cdroms/installcd: Makefile src/distrib/cobalt/cdroms/installcd: Makefile src/distrib/dreamcast/cdroms/installcd: Makefile src/distrib/emips/cdroms/installcd: Makefile src/distrib/evbarm/cdroms/installcd: Makefile src/distrib/evbmips/cdroms/installcd: Makefile src/distrib/evbppc/cdroms/installcd: Makefile src/distrib/evbsh3/cdroms/installcd: Makefile src/distrib/ews4800mips/cdroms/installcd: Makefile src/distrib/hp300/cdroms/installcd: Makefile src/distrib/hpcarm/cdroms/installcd: Makefile src/distrib/hpcmips/cdroms/installcd: Makefile src/distrib/hpcsh/cdroms/installcd: Makefile src/distrib/hppa/cdroms/installcd: Makefile src/distrib/i386/cdroms/installcd: Makefile src/distrib/ia64/cdroms/installcd: Makefile src/distrib/ibmnws/cdroms/installcd: Makefile src/distrib/luna68k/cdroms/installcd: Makefile src/distrib/macppc/cdroms/installcd: Makefile src/distrib/mipsco/cdroms/installcd: Makefile src/distrib/mvme68k/cdroms/installcd: Makefile src/distrib/mvmeppc/cdroms/installcd: Makefile src/distrib/news68k/cdroms/installcd: Makefile src/distrib/newsmips/cdroms/installcd: Makefile src/distrib/ofppc/cdroms/installcd: Makefile src/distrib/playstation2/cdroms/installcd: Makefile src/distrib/pmax/cdroms/installcd: Makefile src/distrib/prep/cdroms/installcd: Makefile src/distrib/sandpoint/cdroms/installcd: Makefile src/distrib/sgimips/cdroms/installcd: Makefile src/distrib/shark/cdroms/installcd: Makefile src/distrib/sparc/cdroms/installcd: Makefile src/distrib/sparc64/cdroms/installcd: Makefile src/distrib/sparc64/instfs: list src/distrib/sun2/cdroms/installcd: Makefile src/distrib/sun3/cdroms/installcd: Makefile src/distrib/vax/cdroms/installcd: Makefile src/distrib/x68k/cdroms/installcd: Makefile src/distrib/zaurus/cdroms/installcd: Makefile Log Message: Now that we do not force debug sets off install CDs any more, explicitly set CDRELEASE_NODEBUG everywhere. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/acorn32/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/alpha/cdroms/installcd/Makefile cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/amiga/cdroms/installcd/Makefile cvs rdiff -u -r1.3 -r1.4 src/distrib/arc/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/atari/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/cats/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/cobalt/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/dreamcast/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/emips/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/evbarm/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/evbmips/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/evbppc/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/evbsh3/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/ews4800mips/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/hp300/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/hpcarm/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/hpcmips/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/hpcsh/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/hppa/cdroms/installcd/Makefile cvs rdiff -u -r1.8 -r1.9 src/distrib/i386/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/ia64/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/ibmnws/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/luna68k/cdroms/installcd/Makefile cvs rdiff -u -r1.2 -r1.3 src/distrib/macppc/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/mipsco/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/mvme68k/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/mvmeppc/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/news68k/cdroms/installcd/Makefile cvs rdiff -u -r1.1 -r1.2 src/distrib/newsmips/cdroms/installcd/Makefile cvs rdiff -u -r1.5 -r1.6 src/distrib/ofppc/cdroms/installcd/Makefile cvs rdiff -u -r1.3 -r1.4 src/distrib/playstation2/cdroms/installcd/Makefile cvs rdiff -u -r1.3 -r1.4 src/distrib/pmax/cdroms/installcd/Makefile cvs rdiff -u
CVS commit: src/lib/libcurses
Module Name:src
Committed By: roy
Date: Fri Sep 28 15:03:48 UTC 2018
Modified Files:
src/lib/libcurses: get_wch.c getch.c resize.c
Log Message:
curses: resizeterm(3) should always send KEY_RESIZE
Fixes #53636
OK kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.69 -r1.70 src/lib/libcurses/getch.c
cvs rdiff -u -r1.26 -r1.27 src/lib/libcurses/resize.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.18 src/lib/libcurses/get_wch.c:1.19
--- src/lib/libcurses/get_wch.c:1.18 Thu Sep 27 14:07:55 2018
+++ src/lib/libcurses/get_wch.c Fri Sep 28 15:03:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: get_wch.c,v 1.18 2018/09/27 14:07:55 roy Exp $ */
+/* $NetBSD: get_wch.c,v 1.19 2018/09/28 15:03:48 roy Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.18 2018/09/27 14:07:55 roy Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.19 2018/09/28 15:03:48 roy Exp $");
#endif /* not lint */
#include
@@ -530,8 +530,8 @@ wget_wch(WINDOW *win, wint_t *ch)
__echoit, __rawmode, _cursesi_screen->nl, win->flags);
#endif
if (_cursesi_screen->resized) {
- _cursesi_screen->resized = 0;
resizeterm(LINES, COLS);
+ _cursesi_screen->resized = 0;
*ch = KEY_RESIZE;
return KEY_CODE_YES;
}
@@ -684,8 +684,8 @@ __fgetwc_resize(FILE *infd, bool *resize
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT, "__fgetwc_resize returning KEY_RESIZE\n");
#endif
- _cursesi_screen->resized = 0;
resizeterm(LINES, COLS);
+ _cursesi_screen->resized = 0;
*resized = true;
return c;
}
Index: src/lib/libcurses/getch.c
diff -u src/lib/libcurses/getch.c:1.69 src/lib/libcurses/getch.c:1.70
--- src/lib/libcurses/getch.c:1.69 Thu Sep 27 14:07:55 2018
+++ src/lib/libcurses/getch.c Fri Sep 28 15:03:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: getch.c,v 1.69 2018/09/27 14:07:55 roy Exp $ */
+/* $NetBSD: getch.c,v 1.70 2018/09/28 15:03:48 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: getch.c,v 1.69 2018/09/27 14:07:55 roy Exp $");
+__RCSID("$NetBSD: getch.c,v 1.70 2018/09/28 15:03:48 roy Exp $");
#endif
#endif /* not lint */
@@ -824,8 +824,8 @@ wgetch(WINDOW *win)
__echoit, __rawmode, _cursesi_screen->nl, win->flags, win->delay);
#endif
if (_cursesi_screen->resized) {
- _cursesi_screen->resized = 0;
resizeterm(LINES, COLS);
+ _cursesi_screen->resized = 0;
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT, "wgetch returning KEY_RESIZE\n");
#endif
@@ -1013,7 +1013,7 @@ __fgetc_resize(FILE *infd)
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT, "__fgetc_resize returning KEY_RESIZE\n");
#endif
- _cursesi_screen->resized = 0;
resizeterm(LINES, COLS);
+ _cursesi_screen->resized = 0;
return KEY_RESIZE;
}
Index: src/lib/libcurses/resize.c
diff -u src/lib/libcurses/resize.c:1.26 src/lib/libcurses/resize.c:1.27
--- src/lib/libcurses/resize.c:1.26 Tue Jan 24 17:27:30 2017
+++ src/lib/libcurses/resize.c Fri Sep 28 15:03:48 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: resize.c,v 1.26 2017/01/24 17:27:30 roy Exp $ */
+/* $NetBSD: resize.c,v 1.27 2018/09/28 15:03:48 roy Exp $ */
/*
* Copyright (c) 2001
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)resize.c blymn 2001/08/26";
#else
-__RCSID("$NetBSD: resize.c,v 1.26 2017/01/24 17:27:30 roy Exp $");
+__RCSID("$NetBSD: resize.c,v 1.27 2018/09/28 15:03:48 roy Exp $");
#endif
#endif/* not lint */
@@ -163,6 +163,8 @@ resizeterm(int nlines, int ncols)
__CTRACE(__CTRACE_WINDOW, "resizeterm: (%d, %d)\n", nlines, ncols);
#endif
+ /* Unconditionally inform application screen has been resized. */
+ _cursesi_screen->resized = 1;
if (!is_term_resized(nlines, ncols))
return OK;
CVS commit: src/distrib/sets
Module Name:src
Committed By: martin
Date: Fri Sep 28 15:04:20 UTC 2018
Modified Files:
src/distrib/sets: Makefile makesrctars makesums maketars
Log Message:
Prepare for .tar.xz sets
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/makesrctars
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/makesums
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/maketars
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.103 src/distrib/sets/Makefile:1.104
--- src/distrib/sets/Makefile:1.103 Tue Aug 16 01:05:19 2016
+++ src/distrib/sets/Makefile Fri Sep 28 15:04:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2016/08/16 01:05:19 mrg Exp $
+# $NetBSD: Makefile,v 1.104 2018/09/28 15:04:20 martin Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -15,8 +15,15 @@ all:
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+.if ${USE_XZ_SETS} != "no"
+COMPRESS_PROGRAM=${TOOL_XZ}
+XZ_OPT=-9
+TAR_SUFF=tar.xz
+.else
COMPRESS_PROGRAM=${TOOL_GZIP}
GZIP_FLAGS= ${GZIP_N_FLAG}
+TAR_SUFF=tgz
+.endif
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
@@ -32,6 +39,8 @@ SETSENV= DESTDIR=${DESTDIR:Q} \
PAX=${TOOL_PAX:Q} \
COMPRESS_PROGRAM=${COMPRESS_PROGRAM:Q} \
GZIP=${GZIP_FLAGS:Q} \
+ XZ_OPT=${XZ_OPT:Q} \
+ TAR_SUFF=${TAR_SUFF:Q} \
PKG_CREATE=${TOOL_PKG_CREATE:Q} \
SED=${TOOL_SED:Q} \
TSORT=${TSORT:Q}
@@ -232,11 +241,11 @@ makesetfiles: .PHONY sanitise_METALOG
.for tar in ${MAKETARSETS}
do-${tar}: .PHONY sanitise_METALOG
- ${_MKMSG_CREATE} "${tar}.tgz"
+ ${_MKMSG_CREATE} "${tar}.${TAR_SUFF}"
${SETSCMD} ./maketars -d ${DESTDIR:S,^$,/,} ${MAKETARS_FLAGS} \
${METALOG.unpriv} \
-N ${NETBSDSRCDIR}/etc -t ${TARDIR} ${tar} \
- || { rm -f ${TARDIR}/${tar}.tgz; false; }
+ || { rm -f ${TARDIR}/${tar}.${TAR_SUFF}; false; }
.endfor
@@ -257,7 +266,7 @@ makesums: .PRECIOUS .PHONY check_RELEASE
.for tar in ${MAKETARSETS}
do-sum-${tar}: .PHONY do-${tar}
${_MKMSG_CREATE} "${tar} checksums"
- ${MAKESUMS} -t ${TARDIR} ${tar}.tgz
+ ${MAKESUMS} -t ${TARDIR} ${tar}.${TAR_SUFF}
for i in MD5 SHA512; do \
${TOOL_CAT} ${TARDIR}/$$i >> ${TARDIR}/$$i.tmp; \
done
Index: src/distrib/sets/makesrctars
diff -u src/distrib/sets/makesrctars:1.41 src/distrib/sets/makesrctars:1.42
--- src/distrib/sets/makesrctars:1.41 Wed Apr 12 17:29:49 2017
+++ src/distrib/sets/makesrctars Fri Sep 28 15:04:20 2018
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: makesrctars,v 1.41 2017/04/12 17:29:49 christos Exp $
+# $NetBSD: makesrctars,v 1.42 2018/09/28 15:04:20 martin Exp $
#
# makesrctars srcdir setdir
# Create source tarballs in setdir from the source under srcdir.
@@ -150,7 +150,7 @@ fi
msg "Creating checksum files"
(cd "${setdir}"
- ${CKSUM} -a md5 *.tgz > MD5
- ${CKSUM} -a sha512 *.tgz > SHA512
+ ${CKSUM} -a md5 *.tgz *.tar.xz > MD5
+ ${CKSUM} -a sha512 *.tgz *.tar.xz > SHA512
)
exit 0
Index: src/distrib/sets/makesums
diff -u src/distrib/sets/makesums:1.16 src/distrib/sets/makesums:1.17
--- src/distrib/sets/makesums:1.16 Sat Sep 19 07:09:54 2009
+++ src/distrib/sets/makesums Fri Sep 28 15:04:20 2018
@@ -1,13 +1,13 @@
#!/bin/sh
#
-# $NetBSD: makesums,v 1.16 2009/09/19 07:09:54 snj Exp $
+# $NetBSD: makesums,v 1.17 2018/09/28 15:04:20 martin Exp $
#
# Make checksum files for files in ``tardir''. Usage:
# makesums [-a] [-t tardir] [setname [...]]
#
# If -t is omitted, RELEASEDIR must be set and not empty.
# The ``setname'' arguments comprise a list of files to checksum,
-# and may be omitted (in which case ``*.tgz'' is used).
+# and may be omitted (in which case ``*.tgz *.tar.xz'' is used).
# If -A is given, then the checksum are appended to possibly existing files.
# NOTE: Don't use this when running parallel jobs
# If -a is given, then the list of sets is ignored, and ``*'' is used.
@@ -35,7 +35,7 @@ Usage: ${prog} [-A] [-a] [-t targetdir]
-A Append to possible existing checksum files
-a checksum all plain files instead of [setname [...]]
-t targetdir \${RELEASEDIR} [${targetdir}]
- setname [...] sets to checksum [*.tgz]
+ setname [...] sets to checksum [*.tgz *.tar.xz]
USAGE
exit 1
}
@@ -69,7 +69,7 @@ pat="$*"
if [ "${dash_all}" = yes ]; then
pat='*'
elif [ -z "${pat}" ]; then
- pat='*.tgz'
+ pat='*.tgz *.tar.xz'
fi
lists="$(${FIND} ${pat} -prune \( -type f -o -type l \) \
\! -name '*SUM' \! -name MD5 \! -name SHA512 2>/dev/null)"
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.88 src/distrib/sets/maketars:1.89
--- src/distrib/sets/maketars:1.88 Wed Sep 26 18:20:59 2018
+++ src/distrib/sets/maketars Fri Sep 28 15:04:20 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.88 2018/09/26 18:20:59 martin Exp $
+# $NetBSD: maketars,v 1.89
CVS commit: src/distrib/common
Module Name:src
Committed By: martin
Date: Fri Sep 28 15:03:34 UTC 2018
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Fix stupid typo (=+ instead of +=).
Remove hard coded debug sets removal, now that the configurable
variant works.
Prepare for .tar.xz sets.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.40 src/distrib/common/Makefile.bootcd:1.41
--- src/distrib/common/Makefile.bootcd:1.40 Mon Jun 25 12:18:22 2018
+++ src/distrib/common/Makefile.bootcd Fri Sep 28 15:03:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.40 2018/06/25 12:18:22 martin Exp $
+# $NetBSD: Makefile.bootcd,v 1.41 2018/09/28 15:03:34 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -53,7 +53,10 @@ CDROMS_RELEASEDIR?= images
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
.endif
.if defined(CDRELEASE_NODEBUG)
-CDRELEASE_EXCLUDE=+ -s ',./binary/sets/debug.tgz,,gp' -s ',./binary/sets/xdebug.tgz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tgz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tgz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/debug.tar.xz,,gp'
+CDRELEASE_EXCLUDE+= -s ',./binary/sets/xdebug.tar.xz,,gp'
.endif
.if !defined(CDRELEASE_LIVEIMAGE)
CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
@@ -189,8 +192,6 @@ copy-releasedir:
${TOOL_PAX} ${PAX_TIMESTAMP}\
-rw -pe ${PAX_v}\
${CDRELEASE_EXCLUDE}\
- -s ',./binary/sets/debug.tgz,,gp' \
- -s ',./binary/sets/xdebug.tgz,,gp' \
. $$release_destdir; \
cd "${CUROBJDIR}"; \
fi
CVS commit: src/tools/file
Module Name:src
Committed By: maya
Date: Fri Sep 28 14:45:16 UTC 2018
Modified Files:
src/tools/file: Makefile
Log Message:
force disable seccomp, in case it gets detected.
the configuration in this version of file is non-functional and results
in build failure if detected. The next version should be fine, but let's
ensure nobody runs into this build failure until it's imported.
reported by e3ef13f4ff44 on freenode.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tools/file/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/file/Makefile
diff -u src/tools/file/Makefile:1.7 src/tools/file/Makefile:1.8
--- src/tools/file/Makefile:1.7 Sun Apr 15 08:37:33 2012
+++ src/tools/file/Makefile Fri Sep 28 14:45:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/04/15 08:37:33 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/09/28 14:45:16 maya Exp $
#
GNUHOSTDIST= ${.CURDIR}/../../external/bsd/file/dist
@@ -9,7 +9,7 @@ CONFIGURE_ENV+= CC=${HOST_CC:Q} \
CXX=${HOST_CXX:Q}
CONFIGURE_ARGS= --program-prefix=${_TOOL_PREFIX} --disable-shared \
- --disable-warnings
+ --disable-warnings --disable-libseccomp
.NOTPARALLEL:
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: jmcneill
Date: Fri Sep 28 13:24:02 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_gpio.c
Log Message:
Fix previous; follow the binding spec for this device when decoding
interrupt specifiers.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm2835_gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_gpio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.7 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.8
--- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.7 Sat May 19 14:02:10 2018
+++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Fri Sep 28 13:24:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.7 2018/05/19 14:02:10 thorpej Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.8 2018/09/28 13:24:02 jmcneill Exp $ */
/*-
* Copyright (c) 2013, 2014, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.7 2018/05/19 14:02:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.8 2018/09/28 13:24:02 jmcneill Exp $");
/*
* Driver for BCM2835 GPIO
@@ -560,12 +560,11 @@ bcmgpio_fdt_intr_establish(device_t dev,
return (NULL);
}
- /* 1st cell is the bank */
- /* 2nd cell is the pin */
- /* 3rd cell is flags */
- const u_int bank = be32toh(specifier[0]);
- const u_int pin = be32toh(specifier[1]);
- const u_int type = be32toh(specifier[2]) & 0xf;
+ /* 1st cell is the GPIO number */
+ /* 2nd cell is flags */
+ const u_int bank = be32toh(specifier[0]) / 32;
+ const u_int pin = be32toh(specifier[0]) % 32;
+ const u_int type = be32toh(specifier[1]) & 0xf;
switch (type) {
case 0x1:
@@ -668,19 +667,16 @@ static bool
bcmgpio_fdt_intrstr(device_t dev, u_int *specifier, char *buf, size_t buflen)
{
- /* 1st cell is the bank */
- /* 2nd cell is the pin */
+ /* 1st cell is the GPIO number */
/* 3rd cell is flags */
if (!specifier)
return (false);
- const u_int bank = be32toh(specifier[0]);
- const u_int pin = be32toh(specifier[1]);
+ const u_int bank = be32toh(specifier[0]) / 32;
+ const u_int pin = be32toh(specifier[0]) % 32;
if (bank >= BCMGPIO_NBANKS)
return (false);
- if (pin >= 32)
- return (false);
-
+
snprintf(buf, buflen, "GPIO %u", (bank * 32) + pin);
return (true);
CVS commit: src/external/bsd/mdocml/dist
Module Name:src
Committed By: uwe
Date: Fri Sep 28 13:21:37 UTC 2018
Modified Files:
src/external/bsd/mdocml/dist: configure
Log Message:
Don't include nbtool_config.h too early. It pulls in system headers
and so #define _GNU_SOURCE afterwards doesn't have any effect on them.
PR bin/53634
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/mdocml/dist/configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/mdocml/dist/configure
diff -u src/external/bsd/mdocml/dist/configure:1.12 src/external/bsd/mdocml/dist/configure:1.13
--- src/external/bsd/mdocml/dist/configure:1.12 Tue Aug 14 13:21:52 2018
+++ src/external/bsd/mdocml/dist/configure Fri Sep 28 13:21:37 2018
@@ -387,14 +387,14 @@ cat << __HEREDOC__
#define __attribute__(x)
#endif
-#ifdef HAVE_NBTOOL_CONFIG_H
-#include "nbtool_config.h"
-#endif
-
#if defined(__linux__) || defined(__MINT__)
#define _GNU_SOURCE /* See test-*.c what needs this. */
#endif
+#ifdef HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
__HEREDOC__
[ ${HAVE_GETLINE} -eq 0 -o \
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Fri Sep 28 09:36:20 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Add a note to revisit the compat_utils stuff, find and document all of its dependencies. To generate a diff of this commit: cvs rdiff -u -r1.1.2.14 -r1.1.2.15 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.compat-module diff -u src/doc/TODO.compat-module:1.1.2.14 src/doc/TODO.compat-module:1.1.2.15 --- src/doc/TODO.compat-module:1.1.2.14 Thu Sep 27 03:54:25 2018 +++ src/doc/TODO.compat-module Fri Sep 28 09:36:20 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.compat-module,v 1.1.2.14 2018/09/27 03:54:25 pgoyette Exp $ */ +/* $NetBSD: TODO.compat-module,v 1.1.2.15 2018/09/28 09:36:20 pgoyette Exp $ */ DONE @@ -107,4 +107,8 @@ TODO - Not required for branch merge and dev/wscons/wsmux that I haven't been able to cleanly separate. These items are not currently included in the monolithic COMPAT module on HEAD, so lack of integration on the branch is not a regression. - + +22. Find all the remaining dependencies on the compat_utils routines and +deal with them appropriately. For now, we simply ensure that they +are included in every kernel via 'options COMPAT_UTILS' in file +sys/conf/std
CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Fri Sep 28 08:42:01 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common Log Message: Use the correct attribute - compat_utils vs compat_util To generate a diff of this commit: cvs rdiff -u -r1.1.2.39 -r1.1.2.40 src/sys/compat/common/files.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.39 src/sys/compat/common/files.common:1.1.2.40 --- src/sys/compat/common/files.common:1.1.2.39 Fri Sep 28 08:08:56 2018 +++ src/sys/compat/common/files.common Fri Sep 28 08:42:01 2018 @@ -1,13 +1,11 @@ -# $NetBSD: files.common,v 1.1.2.39 2018/09/28 08:08:56 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.40 2018/09/28 08:42:01 pgoyette Exp $ # # Generic utility files, used by various compat options. # define compat_netbsd_util -file compat/common/compat_exec.c compat_30 | compat_09 | - compat_util -file compat/common/compat_util.c compat_30 | compat_09 | - compat_util +file compat/common/compat_exec.c compat_utils +file compat/common/compat_util.c compat_utils # # Sources for syscall and ioctl compatibility across the versions.
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Fri Sep 28 08:33:43 UTC 2018
Modified Files:
src/sys/dev/usb [netbsd-8]: ehci.c ehcivar.h xhci.c
Log Message:
Fixup for ticket #1037 - parts of the patch were accidently missing.
To generate a diff of this commit:
cvs rdiff -u -r1.254.8.5 -r1.254.8.6 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.43.10.1 -r1.43.10.2 src/sys/dev/usb/ehcivar.h
cvs rdiff -u -r1.72.2.8 -r1.72.2.9 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.254.8.5 src/sys/dev/usb/ehci.c:1.254.8.6
--- src/sys/dev/usb/ehci.c:1.254.8.5 Thu Sep 27 14:52:26 2018
+++ src/sys/dev/usb/ehci.c Fri Sep 28 08:33:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.254.8.5 2018/09/27 14:52:26 martin Exp $ */
+/* $NetBSD: ehci.c,v 1.254.8.6 2018/09/28 08:33:43 martin Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.5 2018/09/27 14:52:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.6 2018/09/28 08:33:43 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -75,6 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.2
#include
#include
#include
+#include
#include
@@ -446,8 +447,9 @@ ehci_init(ehci_softc_t *sc)
}
if (sc->sc_ncomp > 0) {
KASSERT(!(sc->sc_flags & EHCIF_ETTF));
- aprint_normal("%s: %d companion controller%s, %d port%s%s",
- device_xname(sc->sc_dev), sc->sc_ncomp,
+ aprint_normal_dev(sc->sc_dev,
+ "%d companion controller%s, %d port%s%s",
+ sc->sc_ncomp,
sc->sc_ncomp!=1 ? "s" : "",
EHCI_HCS_N_PCC(sparams),
EHCI_HCS_N_PCC(sparams)!=1 ? "s" : "",
@@ -459,6 +461,11 @@ ehci_init(ehci_softc_t *sc)
device_xname(sc->sc_comps[i]));
}
aprint_normal("\n");
+
+ mutex_init(>sc_complock, MUTEX_DEFAULT, IPL_USB);
+ callout_init(>sc_compcallout, CALLOUT_MPSAFE);
+ cv_init(>sc_compcv, "ehciccv");
+ sc->sc_comp_state = CO_EARLY;
}
sc->sc_noport = EHCI_HCS_N_PORTS(sparams);
sc->sc_hasppc = EHCI_HCS_PPC(sparams);
@@ -1337,6 +1344,19 @@ ehci_detach(struct ehci_softc *sc, int f
if (rv != 0)
return rv;
+ if (sc->sc_ncomp > 0) {
+ mutex_enter(>sc_complock);
+ /* XXX try to halt callout instead of waiting */
+ while (sc->sc_comp_state == CO_SCHED)
+ cv_wait(>sc_compcv, >sc_complock);
+ mutex_exit(>sc_complock);
+
+ callout_halt(>sc_compcallout, NULL);
+ callout_destroy(>sc_compcallout);
+ cv_destroy(>sc_compcv);
+ mutex_destroy(>sc_complock);
+ }
+
callout_halt(>sc_tmo_intrlist, NULL);
callout_destroy(>sc_tmo_intrlist);
@@ -2597,6 +2617,72 @@ ehci_roothub_ctrl(struct usbd_bus *bus,
return totlen;
}
+/*
+ * Handle ehci hand-off in early boot vs RB_ASKNAME/RB_SINGLE.
+ *
+ * This pile of garbage below works around the following problem without
+ * holding boots with no hand-over devices present, while penalising
+ * boots where the first ehci probe hands off devices with a 5 second
+ * delay, if RB_ASKNAME/RB_SINGLE is set. This is typically not a problem
+ * for RB_SINGLE, but the same basic issue exists.
+ *
+ * The way ehci hand-off works, the companion controller does not get the
+ * device until after its' initial bus explore, so the reference dropped
+ * after the first explore is not enough. 5 seconds should be enough,
+ * and EHCI_DISOWN_DELAY_SECONDS can be set to another value.
+ *
+ * There are 3 states. CO_EARLY is set during attach. CO_SCHED is set
+ * if the callback is scheduled. CO_DONE is set when the callout has
+ * called config_pending_decr().
+ *
+ * There's a mutex, a cv and a callout here, and we delay detach if the
+ * callout has been set.
+ */
+#ifndef EHCI_DISOWN_DELAY_SECONDS
+#define EHCI_DISOWN_DELAY_SECONDS 5
+#endif
+static int ehci_disown_delay_seconds = EHCI_DISOWN_DELAY_SECONDS;
+
+static void
+ehci_disown_callback(void *arg)
+{
+ ehci_softc_t *sc = arg;
+
+ config_pending_decr(sc->sc_dev);
+
+ mutex_enter(>sc_complock);
+ KASSERT(sc->sc_comp_state == CO_SCHED);
+ sc->sc_comp_state = CO_DONE;
+ cv_signal(>sc_compcv);
+ mutex_exit(>sc_complock);
+}
+
+static void
+ehci_disown_sched_callback(ehci_softc_t *sc)
+{
+ extern bool root_is_mounted;
+
+ mutex_enter(>sc_complock);
+
+ if (root_is_mounted ||
+ (boothowto & (RB_ASKNAME|RB_SINGLE)) == 0 ||
+ sc->sc_comp_state != CO_EARLY) {
+ mutex_exit(>sc_complock);
+ return;
+ }
+
+ callout_reset(>sc_compcallout, ehci_disown_delay_seconds * hz,
+ ehci_disown_callback, >sc_dev);
+ sc->sc_comp_state = CO_SCHED;
+
+ mutex_exit(>sc_complock);
+
+ config_pending_incr(sc->sc_dev);
+ aprint_normal("delaying %s by %u seconds due to USB owner change.",
+ (boothowto & RB_ASKNAME) == 0 ? "ask root" : "single user",
+ ehci_disown_delay_seconds);
+}
+
Static void
ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
{
@@
CVS commit: src/lib/libcurses
Module Name:src Committed By: kamil Date: Fri Sep 28 08:11:34 UTC 2018 Modified Files: src/lib/libcurses: curses_screen.3 Log Message: Fix typos in curses_screen.3 Fn -> Ft in the resize_term(3) prototype funcion -> function To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/curses_screen.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/curses_screen.3 diff -u src/lib/libcurses/curses_screen.3:1.23 src/lib/libcurses/curses_screen.3:1.24 --- src/lib/libcurses/curses_screen.3:1.23 Tue Jan 24 16:45:41 2017 +++ src/lib/libcurses/curses_screen.3 Fri Sep 28 08:11:34 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_screen.3,v 1.23 2017/01/24 16:45:41 roy Exp $ +.\" $NetBSD: curses_screen.3,v 1.24 2018/09/28 08:11:34 kamil Exp $ .\" .\" Copyright (c) 2002 .\" Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au) @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd January 24, 2017 +.Dd September 28, 2018 .Dt CURSES_SCREEN 3 .Os .Sh NAME @@ -74,7 +74,7 @@ .Fn isendwin "void" .Ft bool .Fn is_term_resized "int lines" "int cols" -.Fn int +.Ft int .Fn resize_term "int lines" "int cols" .Ft int .Fn resizeterm "int lines" "int cols" @@ -216,7 +216,7 @@ Set lines equal to 1. .Pp The .Fn ripoffline -funcion will rip a line from +function will rip a line from .Dv stdscr at the top if .Fa line
CVS commit: [pgoyette-compat] src/sys
Module Name:src Committed By: pgoyette Date: Fri Sep 28 08:08:56 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: files.common src/sys/conf [pgoyette-compat]: std Log Message: Revert previous commit. There are still random unidentified references to these utility routings. To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/sys/compat/common/files.common cvs rdiff -u -r1.22.14.2 -r1.22.14.3 src/sys/conf/std Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/common/files.common diff -u src/sys/compat/common/files.common:1.1.2.38 src/sys/compat/common/files.common:1.1.2.39 --- src/sys/compat/common/files.common:1.1.2.38 Thu Sep 27 23:48:58 2018 +++ src/sys/compat/common/files.common Fri Sep 28 08:08:56 2018 @@ -1,11 +1,13 @@ -# $NetBSD: files.common,v 1.1.2.38 2018/09/27 23:48:58 pgoyette Exp $ +# $NetBSD: files.common,v 1.1.2.39 2018/09/28 08:08:56 pgoyette Exp $ # # Generic utility files, used by various compat options. # define compat_netbsd_util -file compat/common/compat_exec.c compat_30 | compat_09 -file compat/common/compat_util.c compat_30 | compat_09 +file compat/common/compat_exec.c compat_30 | compat_09 | + compat_util +file compat/common/compat_util.c compat_30 | compat_09 | + compat_util # # Sources for syscall and ioctl compatibility across the versions. Index: src/sys/conf/std diff -u src/sys/conf/std:1.22.14.2 src/sys/conf/std:1.22.14.3 --- src/sys/conf/std:1.22.14.2 Thu Sep 27 08:20:44 2018 +++ src/sys/conf/std Fri Sep 28 08:08:56 2018 @@ -1,4 +1,4 @@ -# $NetBSD: std,v 1.22.14.2 2018/09/27 08:20:44 pgoyette Exp $ +# $NetBSD: std,v 1.22.14.3 2018/09/28 08:08:56 pgoyette Exp $ # # standard MI 'options' # @@ -33,6 +33,11 @@ options COREDUMP # allow processes to co options AIO # POSIX asynchronous I/O options MQUEUE # POSIX message queues +# Common compatibility functions. They happen to be needed even when +# no compatibility option is explicitly enabled. +# +optionsCOMPAT_UTILS + # # Security model. #
