CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc
Committed By: nia
Date: Fri Oct 1 07:14:37 UTC 2021
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c
Log Message:
xf86-input-ws: fix building on xorg-server.old (vax, etc)
not entirely sure that the ABI version check is spot on, but the
relevant changes were made in 2011 so hopefully we only have to
support one old xinput API here.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.12 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.13
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.12 Tue Sep 28 06:17:15 2021
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Fri Oct 1 07:14:37 2021
@@ -450,10 +450,12 @@ wsDeviceInit(DeviceIntPtr pWS)
axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
axes_labels[HSCROLL_AXIS] =
XIGetKnownProperty(AXIS_LABEL_PROP_REL_HSCROLL);
axes_labels[VSCROLL_AXIS] =
XIGetKnownProperty(AXIS_LABEL_PROP_REL_VSCROLL);
+#endif
if (!InitValuatorClassDeviceStruct(pWS,
NAXES,
axes_labels,
@@ -483,6 +485,7 @@ wsDeviceInit(DeviceIntPtr pWS)
xf86InitValuatorDefaults(pWS, 1);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
xf86InitValuatorAxisStruct(pWS, HSCROLL_AXIS,
axes_labels[HSCROLL_AXIS], 0, -1, 0, 0, 0, Relative);
xf86InitValuatorAxisStruct(pWS, VSCROLL_AXIS,
@@ -500,6 +503,7 @@ wsDeviceInit(DeviceIntPtr pWS)
*/
SetScrollValuator(pWS, HSCROLL_AXIS, SCROLL_TYPE_HORIZONTAL, 4096, 0);
SetScrollValuator(pWS, VSCROLL_AXIS, SCROLL_TYPE_VERTICAL, 4096, 0);
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
xf86MotionHistoryAllocate(pInfo);
@@ -624,7 +628,9 @@ wsReadInput(InputInfoPtr pInfo)
int buttons = priv->lastButtons;
int dx = 0, dy = 0, dz = 0, dw = 0;
int zbutton = 0, wbutton = 0;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
int hscroll = 0, vscroll = 0;
+#endif
ax = 0; ay = 0;
switch (event->type) {
@@ -674,6 +680,7 @@ wsReadInput(InputInfoPtr pInfo)
DBG(4, ErrorF("Relative W %d\n", event->value));
dw = event->value;
break;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
case WSCONS_EVENT_HSCROLL:
hscroll = event->value;
DBG(4, ErrorF("Horiz. Scrolling %d\n", event->value));
@@ -682,6 +689,7 @@ wsReadInput(InputInfoPtr pInfo)
vscroll = event->value;
DBG(4, ErrorF("Vert. Scrolling %d\n", event->value));
break;
+#endif
default:
xf86Msg(X_WARNING, "%s: bad wsmouse event type=%d\n",
pInfo->name, event->type);
@@ -726,6 +734,7 @@ wsReadInput(InputInfoPtr pInfo)
buttons |= wbutton;
dw = 0;
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 14
if (hscroll || vscroll) {
xf86Msg(X_WARNING, "%s: hscroll=%d, vscroll=%d\n",
pInfo->name, hscroll, vscroll);
@@ -736,6 +745,7 @@ wsReadInput(InputInfoPtr pInfo)
VSCROLL_AXIS, (double) vscroll);
xf86PostMotionEventM(pInfo->dev, FALSE, priv->scroll_mask);
}
+#endif
if (priv->lastButtons != buttons) {
/* button event */
wsSendButtons(pInfo, buttons);
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc Committed By: nia Date: Fri Oct 1 07:14:37 UTC 2021 Modified Files: xsrc/external/mit/xf86-input-ws/dist/src: ws.c Log Message: xf86-input-ws: fix building on xorg-server.old (vax, etc) not entirely sure that the ABI version check is spot on, but the relevant changes were made in 2011 so hopefully we only have to support one old xinput API here. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xf86-input-ws/dist/src/ws.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: rin Date: Fri Oct 1 06:07:12 UTC 2021 Modified Files: src/sys/arch/hpcarm/conf: files.sa11x0 Log Message: Comment out hpcarm/spl.S, which was superseded by arm32/spl.S. No functional changes; We had two source files for spl.o, but correct file was chosen by config(1). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/conf/files.sa11x0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: rin Date: Fri Oct 1 06:07:12 UTC 2021 Modified Files: src/sys/arch/hpcarm/conf: files.sa11x0 Log Message: Comment out hpcarm/spl.S, which was superseded by arm32/spl.S. No functional changes; We had two source files for spl.o, but correct file was chosen by config(1). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/conf/files.sa11x0 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/hpcarm/conf/files.sa11x0 diff -u src/sys/arch/hpcarm/conf/files.sa11x0:1.1 src/sys/arch/hpcarm/conf/files.sa11x0:1.2 --- src/sys/arch/hpcarm/conf/files.sa11x0:1.1 Sat Apr 17 13:36:21 2010 +++ src/sys/arch/hpcarm/conf/files.sa11x0 Fri Oct 1 06:07:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: files.sa11x0,v 1.1 2010/04/17 13:36:21 nonaka Exp $ +# $NetBSD: files.sa11x0,v 1.2 2021/10/01 06:07:12 rin Exp $ # # SA-11x0 model specific configuration info # @@ -6,7 +6,7 @@ # SA-11x0 specific files. #file arch/hpcarm/hpcarm/intr.c file arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c -file arch/hpcarm/hpcarm/spl.S +#file arch/hpcarm/hpcarm/spl.S file arch/arm/arm32/intr.c file arch/arm/arm32/spl.S
CVS commit: src/sys/arch/hpcarm
Module Name:src Committed By: rin Date: Fri Oct 1 06:08:43 UTC 2021 Modified Files: src/sys/arch/hpcarm/conf: files.sa11x0 Removed Files: src/sys/arch/hpcarm/hpcarm: intr.c spl.S Log Message: G/C unused over a decade. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/conf/files.sa11x0 cvs rdiff -u -r1.19 -r0 src/sys/arch/hpcarm/hpcarm/intr.c cvs rdiff -u -r1.7 -r0 src/sys/arch/hpcarm/hpcarm/spl.S 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/hpcarm/conf/files.sa11x0 diff -u src/sys/arch/hpcarm/conf/files.sa11x0:1.2 src/sys/arch/hpcarm/conf/files.sa11x0:1.3 --- src/sys/arch/hpcarm/conf/files.sa11x0:1.2 Fri Oct 1 06:07:12 2021 +++ src/sys/arch/hpcarm/conf/files.sa11x0 Fri Oct 1 06:08:43 2021 @@ -1,12 +1,10 @@ -# $NetBSD: files.sa11x0,v 1.2 2021/10/01 06:07:12 rin Exp $ +# $NetBSD: files.sa11x0,v 1.3 2021/10/01 06:08:43 rin Exp $ # # SA-11x0 model specific configuration info # # SA-11x0 specific files. -#file arch/hpcarm/hpcarm/intr.c file arch/hpcarm/hpcarm/sa11x0_hpc_machdep.c -#file arch/hpcarm/hpcarm/spl.S file arch/arm/arm32/intr.c file arch/arm/arm32/spl.S
CVS commit: src/sys/arch/hpcarm
Module Name:src Committed By: rin Date: Fri Oct 1 06:08:43 UTC 2021 Modified Files: src/sys/arch/hpcarm/conf: files.sa11x0 Removed Files: src/sys/arch/hpcarm/hpcarm: intr.c spl.S Log Message: G/C unused over a decade. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcarm/conf/files.sa11x0 cvs rdiff -u -r1.19 -r0 src/sys/arch/hpcarm/hpcarm/intr.c cvs rdiff -u -r1.7 -r0 src/sys/arch/hpcarm/hpcarm/spl.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.riscv
Module Name:src Committed By: jmcneill Date: Fri Oct 1 10:38:03 UTC 2021 Modified Files: src/etc/etc.riscv: Makefile.inc Log Message: riscv: Include kernel and bootloader in releasedir. This change adds a kern-GENERIC set and distributes an INSTALL kernel along with bootriscv64.efi as part of a standard release build. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/etc/etc.riscv/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.riscv
Module Name:src
Committed By: jmcneill
Date: Fri Oct 1 10:38:03 UTC 2021
Modified Files:
src/etc/etc.riscv: Makefile.inc
Log Message:
riscv: Include kernel and bootloader in releasedir.
This change adds a kern-GENERIC set and distributes an INSTALL kernel
along with bootriscv64.efi as part of a standard release build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/etc/etc.riscv/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/etc/etc.riscv/Makefile.inc
diff -u src/etc/etc.riscv/Makefile.inc:1.1 src/etc/etc.riscv/Makefile.inc:1.2
--- src/etc/etc.riscv/Makefile.inc:1.1 Fri Sep 19 17:36:24 2014
+++ src/etc/etc.riscv/Makefile.inc Fri Oct 1 10:38:03 2021
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile.inc,v 1.2 2021/10/01 10:38:03 jmcneill Exp $
+#
+# etc.riscv/Makefile.inc -- riscv-specific etc Makefile targets
+#
+
+KERNEL_SETS= GENERIC
+EXTRA_KERNELS= INSTALL
+
+.if ${MACHINE_ARCH} == "riscv64" && ${HAVE_UEFI} == "yes"
+INSTALLATION_DIRS+= installation/misc
+.endif
+
+snap_md_post:
+.if ${MACHINE_ARCH} == "riscv64" && ${HAVE_UEFI} == "yes"
+ cd ${KERNSRCDIR}/stand/efiboot/bootriscv64 && ${MAKE} release
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.efi'
+.endif
+
+.include
CVS commit: src/lib
Module Name:src
Committed By: christos
Date: Fri Oct 1 17:13:44 UTC 2021
Modified Files:
src/lib/libc/sys: Makefile.inc
src/lib/libpthread: pthread_cancelstub.c
Log Message:
PR/56424: Clay Mayers: recvfrom() is not a cancelation point as documented
in pthread_setcanceltype.3
To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/lib/libc/sys/Makefile.inc
cvs rdiff -u -r1.38 -r1.39 src/lib/libpthread/pthread_cancelstub.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/libc/sys/Makefile.inc
diff -u src/lib/libc/sys/Makefile.inc:1.246 src/lib/libc/sys/Makefile.inc:1.247
--- src/lib/libc/sys/Makefile.inc:1.246 Sun Sep 19 11:51:28 2021
+++ src/lib/libc/sys/Makefile.inc Fri Oct 1 13:13:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.246 2021/09/19 15:51:28 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.247 2021/10/01 17:13:44 christos Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
@@ -97,7 +97,7 @@ ASM=\
__acl_aclcheck_file.S __acl_aclcheck_fd.S \
access.S acct.S \
bind.S \
- chdir.S chflags.S chmod.S chown.S chroot.S clock_nanosleep.S \
+ chdir.S chflags.S chmod.S chown.S chroot.S \
clock_getcpuclockid2.S \
__clock_getres50.S __clock_gettime50.S \
dup.S dup2.S dup3.S \
@@ -137,15 +137,14 @@ ASM=\
mprotect.S __msgctl50.S msgget.S munlock.S munlockall.S \
munmap.S \
nfssvc.S __ntp_gettime50.S \
- openat.S \
pathconf.S pipe2.S \
__posix_chown.S __posix_fchown.S __posix_lchown.S \
__posix_rename.S profil.S \
__quotactl.S \
- rasctl.S readlinkat.S reboot.S recvfrom.S recvmmsg.S recvmsg.S \
+ rasctl.S readlinkat.S reboot.S \
rename.S renameat.S revoke.S rmdir.S \
semconfig.S semget.S semop.S \
- sendmmsg.S sendmsg.S sendto.S setegid.S seteuid.S \
+ setegid.S seteuid.S \
setgid.S setgroups.S __setitimer50.S __setlogin.S setpgid.S \
setpriority.S \
setregid.S setreuid.S setrlimit.S setsid.S setsockopt.S \
@@ -175,15 +174,19 @@ ASM_MD= _lwp_getprivate.S mremap.S
. endif
.endfor
-WEAKASM= accept.S __aio_suspend50.S close.S connect.S execve.S \
+WEAKASM= accept.S __aio_suspend50.S clock_nanosleep.S close.S connect.S \
+ execve.S \
fcntl.S fdatasync.S fsync.S \
fsync_range.S __kevent50.S \
kill.S mq_receive.S mq_send.S __mq_timedreceive50.S __mq_timedsend50.S \
- msgrcv.S msgsnd.S __msync13.S __nanosleep50.S open.S paccept.S poll.S \
+ msgrcv.S msgsnd.S __msync13.S __nanosleep50.S open.S openat.S \
+ paccept.S poll.S \
__pollts50.S __pselect50.S read.S readlink.S \
- readv.S _sched_setparam.S _sched_getparam.S _sched_setaffinity.S \
+ readv.S recvfrom.S recvmmsg.S recvmsg.S \
+ _sched_setparam.S _sched_getparam.S _sched_setaffinity.S \
_sched_getaffinity.S sched_yield.S _sched_protect.S \
- __select50.S setcontext.S __sigprocmask14.S __sigsuspend14.S sysarch.S \
+ __select50.S sendmmsg.S sendmsg.S sendto.S \
+ setcontext.S __sigprocmask14.S __sigsuspend14.S sysarch.S \
__wait450.S wait6.S write.S writev.S
NOERR= getegid.S geteuid.S getgid.S getpid.S getppid.S getuid.S \
Index: src/lib/libpthread/pthread_cancelstub.c
diff -u src/lib/libpthread/pthread_cancelstub.c:1.38 src/lib/libpthread/pthread_cancelstub.c:1.39
--- src/lib/libpthread/pthread_cancelstub.c:1.38 Thu Mar 21 12:49:12 2013
+++ src/lib/libpthread/pthread_cancelstub.c Fri Oct 1 13:13:44 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_cancelstub.c,v 1.38 2013/03/21 16:49:12 christos Exp $ */
+/* $NetBSD: pthread_cancelstub.c,v 1.39 2021/10/01 17:13:44 christos Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#undef _FORTIFY_SOURCE
#include
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.38 2013/03/21 16:49:12 christos Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.39 2021/10/01 17:13:44 christos Exp $");
#ifndef lint
@@ -90,6 +90,8 @@ int _sys___aio_suspend50(const struct ai
const struct timespec *);
int __aio_suspend50(const struct aiocb * const [], int,
const struct timespec *);
+int _sys_clock_nanosleep(clockid_t clock_id, int flags,
+ const struct timespec *rqtp, struct timespec *rmtp);
int _sys_close(int);
int _sys_connect(int, const struct sockaddr *, socklen_t);
int _sys_fcntl(int, int, ...);
@@ -110,6 +112,7 @@ int _sys___msync13(void *, size_t, int);
int _sys___nanosleep50(const struct timespec *, struct timespec *);
int __nanosleep50(const struct timespec *, struct timespec *);
int _sys_open(const char *, int, ...);
+int _sys_openat(int, const char *, int, ...);
int _sys_poll(struct pollfd *, nfds_t, int);
int _sys___pollts50(struct pollfd *, nfds_t, const struct timespec *,
const sigset_t *);
@@ -119,6 +122,16 @@ int _sys___pselect50(int, fd_set *, fd_s
ssize_t _sys_pwrite(int, const void *, size_t, off_t);
ssize_t _sys_read(int, void *, size_t);
ssize_t _sys_readv(int, const struct iovec *, int);
+ssize_t _sys_recvfrom(int,
CVS commit: src/lib
Module Name:src Committed By: christos Date: Fri Oct 1 17:13:44 UTC 2021 Modified Files: src/lib/libc/sys: Makefile.inc src/lib/libpthread: pthread_cancelstub.c Log Message: PR/56424: Clay Mayers: recvfrom() is not a cancelation point as documented in pthread_setcanceltype.3 To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/lib/libc/sys/Makefile.inc cvs rdiff -u -r1.38 -r1.39 src/lib/libpthread/pthread_cancelstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: martin Date: Fri Oct 1 17:20:32 UTC 2021 Modified Files: src/external/gpl3/gdb/dist/gdb: alpha-nbsd-tdep.c Log Message: Make this compilable as tool with MKCROSSGDB=yes To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: martin
Date: Fri Oct 1 17:20:32 UTC 2021
Modified Files:
src/external/gpl3/gdb/dist/gdb: alpha-nbsd-tdep.c
Log Message:
Make this compilable as tool with MKCROSSGDB=yes
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.9 src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.10
--- src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c:1.9 Sat Dec 5 22:14:44 2020
+++ src/external/gpl3/gdb/dist/gdb/alpha-nbsd-tdep.c Fri Oct 1 17:20:32 2021
@@ -161,6 +161,12 @@ static const struct regset alphanbsd_fpr
/* Iterate over supported core file register note sections. */
+
+void
+alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache);
void
alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
iterate_over_regset_sections_cb *cb,
@@ -239,8 +245,8 @@ alphanbsd_sigtramp_cache_init (const str
struct trad_frame_cache *this_cache,
CORE_ADDR func)
{
- struct gdbarch *gdbarch = get_frame_arch (this_frame);
- struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+ /* struct gdbarch *gdbarch = get_frame_arch (this_frame); */
+ /* struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); */
CORE_ADDR addr, sp;
int i;
CVS commit: src/lib/libpthread
Module Name:src Committed By: christos Date: Fri Oct 1 20:13:38 UTC 2021 Modified Files: src/lib/libpthread: pthread_cancelstub.c Log Message: remove parameter names from decls. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/lib/libpthread/pthread_cancelstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpthread
Module Name:src
Committed By: christos
Date: Fri Oct 1 20:13:38 UTC 2021
Modified Files:
src/lib/libpthread: pthread_cancelstub.c
Log Message:
remove parameter names from decls.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libpthread/pthread_cancelstub.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/libpthread/pthread_cancelstub.c
diff -u src/lib/libpthread/pthread_cancelstub.c:1.39 src/lib/libpthread/pthread_cancelstub.c:1.40
--- src/lib/libpthread/pthread_cancelstub.c:1.39 Fri Oct 1 13:13:44 2021
+++ src/lib/libpthread/pthread_cancelstub.c Fri Oct 1 16:13:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_cancelstub.c,v 1.39 2021/10/01 17:13:44 christos Exp $ */
+/* $NetBSD: pthread_cancelstub.c,v 1.40 2021/10/01 20:13:38 christos Exp $ */
/*-
* Copyright (c) 2002, 2007 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#undef _FORTIFY_SOURCE
#include
-__RCSID("$NetBSD: pthread_cancelstub.c,v 1.39 2021/10/01 17:13:44 christos Exp $");
+__RCSID("$NetBSD: pthread_cancelstub.c,v 1.40 2021/10/01 20:13:38 christos Exp $");
#ifndef lint
@@ -127,11 +127,10 @@ ssize_t _sys_recvfrom(int, void * restri
ssize_t _sys_recvmsg(int, struct msghdr *, int);
int _sys_recvmmsg(int, struct mmsghdr *, unsigned int, unsigned int,
struct timespec *);
-ssize_t _sys_sendto(int s, const void *msg, size_t len, int flags,
-const struct sockaddr *to, socklen_t tolen);
-ssize_t _sys_sendmsg(int s, const struct msghdr *msg, int flags);
-int _sys_sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen,
-unsigned int flags);
+ssize_t _sys_sendto(int, const void *, size_t, int, const struct sockaddr *,
+socklen_t);
+ssize_t _sys_sendmsg(int, const struct msghdr *, int);
+int _sys_sendmmsg(int, struct mmsghdr *, unsigned int, unsigned int);
int _sys___select50(int, fd_set *, fd_set *, fd_set *, struct timeval *);
int _sys___wait450(pid_t, int *, int, struct rusage *);
ssize_t _sys_write(int, const void *, size_t);
CVS commit: src/doc
Module Name:src Committed By: kre Date: Fri Oct 1 22:42:28 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: tzdata partial update to 2021b To generate a diff of this commit: cvs rdiff -u -r1.1818 -r1.1819 src/doc/3RDPARTY cvs rdiff -u -r1.2835 -r1.2836 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: kre Date: Fri Oct 1 22:42:28 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: tzdata partial update to 2021b To generate a diff of this commit: cvs rdiff -u -r1.1818 -r1.1819 src/doc/3RDPARTY cvs rdiff -u -r1.2835 -r1.2836 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1818 src/doc/3RDPARTY:1.1819 --- src/doc/3RDPARTY:1.1818 Thu Sep 30 19:11:22 2021 +++ src/doc/3RDPARTY Fri Oct 1 22:42:28 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1818 2021/09/30 19:11:22 jmcneill Exp $ +# $NetBSD: 3RDPARTY,v 1.1819 2021/10/01 22:42:28 kre Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1409,8 +1409,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2021a / tzdata2021a -Current Vers: tzcode2021a / tzdata2021a +Version: tzcode2021a / tzdata2021b- +Current Vers: tzcode2021b / tzdata2021b Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2835 src/doc/CHANGES:1.2836 --- src/doc/CHANGES:1.2835 Thu Sep 30 19:12:04 2021 +++ src/doc/CHANGES Fri Oct 1 22:42:28 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2835 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2836 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -430,3 +430,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: pam-u2f: Import pam u2f 1.2.0 [christos 20210924] OpenSSH: Import 8.8. [christos 20210927] gnu-efi: Import version 3.0.14. [jmcneill 20210930] + tzdata partly updated to 2021b [kre 20211001]
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Fri Oct 1 21:01:34 UTC 2021 Modified Files: src/sys/dev/usb: usbdevs Log Message: add PixArt Raspberry Pi Mouse To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Fri Oct 1 21:01:34 UTC 2021 Modified Files: src/sys/dev/usb: usbdevs Log Message: add PixArt Raspberry Pi Mouse To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/sys/dev/usb/usbdevs 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.794 src/sys/dev/usb/usbdevs:1.795 --- src/sys/dev/usb/usbdevs:1.794 Sun Jun 13 09:23:42 2021 +++ src/sys/dev/usb/usbdevs Fri Oct 1 21:01:34 2021 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.794 2021/06/13 09:23:42 mlelstv Exp $ +$NetBSD: usbdevs,v 1.795 2021/10/01 21:01:34 macallan Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -368,6 +368,7 @@ vendor GARMIN 0x091e Garmin Internation vendor GOHUBS 0x0921 GoHubs vendor BIOMETRIC 0x0929 American Biometric Company vendor TOSHIBA 0x0930 Toshiba +vendor PIXART 0x093a PixArt vendor PLEXTOR 0x093b Plextor vendor INTREPIDCS 0x093c Intrepid vendor YANO 0x094f Yano @@ -2715,6 +2716,9 @@ product PINNACLE PCTVDVBTFLASH 0x0228 Pi product PINNACLE PCTV72E 0x0236 Pinnacle PCTV 72e product PINNACLE PCTV73E 0x0237 Pinnacle PCTV 73e +/* PixArt */ +product PIXART RPIMOUSE 0x2510 Raspberry Pi Mouse + /* Planex Communications products */ product PLANEX GW_US11H 0x14ea GW-US11H WLAN product PLANEX2 RTL8188CUS 0x1201 RTL8188CUS
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Fri Oct 1 21:03:51 UTC 2021 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.784 -r1.785 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: tsutsui Date: Sat Oct 2 04:28:54 UTC 2021 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: kbd.c Log Message: Handle DEVICE_ABORT to restore the original keyboard state after crash. No particular comment in PR xsrc/56415. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-keyboard/dist/src
Module Name:xsrc Committed By: tsutsui Date: Sat Oct 2 04:28:54 UTC 2021 Modified Files: xsrc/external/mit/xf86-input-keyboard/dist/src: kbd.c Log Message: Handle DEVICE_ABORT to restore the original keyboard state after crash. No particular comment in PR xsrc/56415. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c diff -u xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.7 xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.8 --- xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c:1.7 Sun Mar 5 08:05:23 2017 +++ xsrc/external/mit/xf86-input-keyboard/dist/src/kbd.c Sat Oct 2 04:28:54 2021 @@ -384,6 +384,15 @@ KbdProc(DeviceIntPtr device, int what) device->public.on = FALSE; break; +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 100 + GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 1901 + case DEVICE_ABORT: +/* + * Restore original keyboard state even on crash. + */ +pKbd->KbdOff(pInfo, what); +break; +#endif + default: return BadValue; }
CVS commit: src
Module Name:src Committed By: thorpej Date: Sat Oct 2 02:07:42 UTC 2021 Modified Files: src/sys/kern: uipc_socket2.c src/sys/miscfs/fifofs: fifo_vnops.c src/tests/lib/libc/sys: t_poll.c Log Message: - fifo_poll(): If the last writer has disappeared, detect this and return POLLHUP, per POSIX. - fifo_close(): Use the new fifo_socantrcvmore(), which is like the garden-variety socantrcvmore(), except it specifies POLL_HUP rather than POLL_IN (so the correct code for SIGIO is sent). - sowakeup(): Allow POLL_HUP as a code (notifies poll'ers with POLLHUP). - Add test cases for correct POLLHUP behavior with FIFOs. Fixes PR kern/56429. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/sys/kern/uipc_socket2.c cvs rdiff -u -r1.86 -r1.87 src/sys/miscfs/fifofs/fifo_vnops.c cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_poll.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: thorpej
Date: Sat Oct 2 02:07:42 UTC 2021
Modified Files:
src/sys/kern: uipc_socket2.c
src/sys/miscfs/fifofs: fifo_vnops.c
src/tests/lib/libc/sys: t_poll.c
Log Message:
- fifo_poll(): If the last writer has disappeared, detect this and return
POLLHUP, per POSIX.
- fifo_close(): Use the new fifo_socantrcvmore(), which is like the
garden-variety socantrcvmore(), except it specifies POLL_HUP rather
than POLL_IN (so the correct code for SIGIO is sent).
- sowakeup(): Allow POLL_HUP as a code (notifies poll'ers with POLLHUP).
- Add test cases for correct POLLHUP behavior with FIFOs.
Fixes PR kern/56429.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/kern/uipc_socket2.c
cvs rdiff -u -r1.86 -r1.87 src/sys/miscfs/fifofs/fifo_vnops.c
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/sys/t_poll.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/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.139 src/sys/kern/uipc_socket2.c:1.140
--- src/sys/kern/uipc_socket2.c:1.139 Thu Mar 4 01:35:31 2021
+++ src/sys/kern/uipc_socket2.c Sat Oct 2 02:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.139 2021/03/04 01:35:31 msaitoh Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.140 2021/10/02 02:07:41 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.139 2021/03/04 01:35:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.140 2021/10/02 02:07:41 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -555,10 +555,27 @@ sowakeup(struct socket *so, struct sockb
KASSERT(solocked(so));
KASSERT(sb->sb_so == so);
- if (code == POLL_IN)
+ switch (code) {
+ case POLL_IN:
band = POLLIN|POLLRDNORM;
- else
+ break;
+
+ case POLL_OUT:
band = POLLOUT|POLLWRNORM;
+ break;
+
+ case POLL_HUP:
+ band = POLLHUP;
+ break;
+
+ default:
+ band = 0;
+#ifdef DIAGNOSTIC
+ printf("bad siginfo code %d in socket notification.\n", code);
+#endif
+ break;
+ }
+
sb->sb_flags &= ~SB_NOTIFY;
selnotify(>sb_sel, band, NOTE_SUBMIT);
cv_broadcast(>sb_cv);
Index: src/sys/miscfs/fifofs/fifo_vnops.c
diff -u src/sys/miscfs/fifofs/fifo_vnops.c:1.86 src/sys/miscfs/fifofs/fifo_vnops.c:1.87
--- src/sys/miscfs/fifofs/fifo_vnops.c:1.86 Wed Sep 29 13:15:45 2021
+++ src/sys/miscfs/fifofs/fifo_vnops.c Sat Oct 2 02:07:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fifo_vnops.c,v 1.86 2021/09/29 13:15:45 thorpej Exp $ */
+/* $NetBSD: fifo_vnops.c,v 1.87 2021/10/02 02:07:41 thorpej Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.86 2021/09/29 13:15:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fifo_vnops.c,v 1.87 2021/10/02 02:07:41 thorpej Exp $");
#include
#include
@@ -337,24 +337,69 @@ fifo_poll(void *v)
struct vop_poll_args /* {
struct vnode *a_vp;
int a_events;
- struct lwp *a_l;
} */ *ap = v;
- struct socket *so;
- int revents;
+ struct socket *rso = ap->a_vp->v_fifoinfo->fi_readsock;
+ struct socket *wso = ap->a_vp->v_fifoinfo->fi_writesock;
+ struct socket *lso = NULL;
+ int events;
+
+ /*
+ * N.B. We're using a slightly different naming convention
+ * for these variables that most poll handlers.
+ */
+ int revents = 0;
+ int wevents = 0;
+
+ if (rso != NULL) {
+ lso = rso;
+ } else if (wso != NULL) {
+ lso = wso;
+ }
- revents = 0;
- if (ap->a_events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
- so = ap->a_vp->v_fifoinfo->fi_readsock;
- if (so)
- revents |= sopoll(so, ap->a_events);
+ if (lso == NULL) {
+ /* No associated sockets -> no events to report. */
+ return 0;
+ }
+
+ KASSERT(rso == NULL || lso->so_lock == rso->so_lock);
+ KASSERT(wso == NULL || lso->so_lock == wso->so_lock);
+
+ solock(lso);
+
+ if (rso != NULL) {
+ events = ap->a_events & (POLLIN | POLLRDNORM);
+ if (events != 0 && soreadable(rso)) {
+ revents |= events;
+ }
+ if (rso->so_state & SS_CANTRCVMORE) {
+ revents |= POLLHUP;
+ }
+ /*
+ * We always selrecord the read side here regardless
+ * of the caller's read interest because we need to
+ * action POLLHUP.
+ */
+ if (revents == 0) {
+ selrecord(curlwp, >so_rcv.sb_sel);
+ rso->so_rcv.sb_flags |= SB_NOTIFY;
+ }
}
- if (ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND)) {
- so = ap->a_vp->v_fifoinfo->fi_writesock;
- if (so)
- revents |= sopoll(so, ap->a_events);
+
+ /* POSIX sez: POLLHUP and POLLOUT are mutually-exclusive. */
+ if (wso != NULL && (revents & POLLHUP) == 0) {
+ events = ap->a_events & (POLLOUT | POLLWRNORM);
+ if (events != 0 && sowritable(wso)) {
+ wevents |= events;
+ }
+ if (wevents == 0 && events != 0) {
+ selrecord(curlwp, >so_snd.sb_sel);
+ wso->so_snd.sb_flags |= SB_NOTIFY;
+ }
}
- return
CVS commit: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Fri Oct 1 22:35:07 UTC 2021 Modified Files: src/external/public-domain/tz/dist: TZDATA_VERSION asia australasia version Log Message: Cherry pick the important changes from tzdata2031b: Samoa (Pacific/Apia) has cancelled summer time this year (change effective last Sunday). Jordan (Asia/Amman) has moved the start of summer time from the last Thu/Fri in March to the last Thu/Fri in Feb to begin next year (2022). Some more of the non-controversial (and less important, mostly some corrections to historical data) changes may follow soon. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.28 -r1.2 src/external/public-domain/tz/dist/asia cvs rdiff -u -r1.1.1.21 -r1.2 src/external/public-domain/tz/dist/australasia \ src/external/public-domain/tz/dist/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/tz/dist
Module Name:src Committed By: kre Date: Fri Oct 1 22:35:07 UTC 2021 Modified Files: src/external/public-domain/tz/dist: TZDATA_VERSION asia australasia version Log Message: Cherry pick the important changes from tzdata2031b: Samoa (Pacific/Apia) has cancelled summer time this year (change effective last Sunday). Jordan (Asia/Amman) has moved the start of summer time from the last Thu/Fri in March to the last Thu/Fri in Feb to begin next year (2022). Some more of the non-controversial (and less important, mostly some corrections to historical data) changes may follow soon. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.28 -r1.2 src/external/public-domain/tz/dist/asia cvs rdiff -u -r1.1.1.21 -r1.2 src/external/public-domain/tz/dist/australasia \ src/external/public-domain/tz/dist/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/tz/dist/TZDATA_VERSION diff -u src/external/public-domain/tz/dist/TZDATA_VERSION:1.24 src/external/public-domain/tz/dist/TZDATA_VERSION:1.25 --- src/external/public-domain/tz/dist/TZDATA_VERSION:1.24 Sun Jan 24 21:59:37 2021 +++ src/external/public-domain/tz/dist/TZDATA_VERSION Fri Oct 1 22:35:06 2021 @@ -1 +1 @@ -tzdata-2021a +tzdata-2021b-partial Index: src/external/public-domain/tz/dist/asia diff -u src/external/public-domain/tz/dist/asia:1.1.1.28 src/external/public-domain/tz/dist/asia:1.2 --- src/external/public-domain/tz/dist/asia:1.1.1.28 Thu Dec 31 07:50:05 2020 +++ src/external/public-domain/tz/dist/asia Fri Oct 1 22:35:06 2021 @@ -2234,6 +2234,14 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # From Paul Eggert (2013-12-11): # As Steffen suggested, consider the past 21-month experiment to be DST. +# From Steffen Thorsen (2021-09-24): +# The Jordanian Government announced yesterday that they will start DST +# in February instead of March: +# https://petra.gov.jo/Include/InnerPage.jsp?ID=37683=en=en_news (English) +# https://petra.gov.jo/Include/InnerPage.jsp?ID=189969=ar=news (Arabic) +# From the Arabic version, it seems to say it would be at midnight +# (assume 24:00) on the last Thursday in February, starting from 2022. + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - @@ -2264,8 +2272,9 @@ Rule Jordan 2004 only - Oct 15 0:00s 0 - Rule Jordan 2005 only - Sep lastFri 0:00s 0 - Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - Rule Jordan 2013 only - Dec 20 0:00 0 - -Rule Jordan 2014 max - Mar lastThu 24:00 1:00 S +Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S Rule Jordan 2014 max - Oct lastFri 0:00s 0 - +Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 2:00 Jordan EE%sT Index: src/external/public-domain/tz/dist/australasia diff -u src/external/public-domain/tz/dist/australasia:1.1.1.21 src/external/public-domain/tz/dist/australasia:1.2 --- src/external/public-domain/tz/dist/australasia:1.1.1.21 Thu Dec 31 07:50:07 2020 +++ src/external/public-domain/tz/dist/australasia Fri Oct 1 22:35:06 2021 @@ -742,13 +742,17 @@ Link Pacific/Pago_Pago Pacific/Midway # # From Paul Eggert (2014-07-08): # That web page currently lists transitions for 2012/3 and 2013/4. # Assume the pattern instituted in 2012 will continue indefinitely. +# +# From Geoffrey D. Bennett (2021-09-20): +# https://www.mcil.gov.ws/storage/2021/09/MCIL-Scan_20210920_120553.pdf +# DST has been cancelled for this year. # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule WS 2010 only - Sep lastSun 0:00 1 - Rule WS 2011 only - Apr Sat>=1 4:00 0 - Rule WS 2011 only - Sep lastSat 3:00 1 - -Rule WS 2012 max - Apr Sun>=1 4:00 0 - -Rule WS 2012 max - Sep lastSun 3:00 1 - +Rule WS 2012 2021 - Apr Sun>=1 4:00 0 - +Rule WS 2012 2020 - Sep lastSun 3:00 1 - # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5 -11:26:56 - LMT 1911 Index: src/external/public-domain/tz/dist/version diff -u src/external/public-domain/tz/dist/version:1.1.1.21 src/external/public-domain/tz/dist/version:1.2 --- src/external/public-domain/tz/dist/version:1.1.1.21 Sun Jan 24 21:59:03 2021 +++ src/external/public-domain/tz/dist/version Fri Oct 1 22:35:07 2021 @@ -1 +1 @@ -2021a +2021b
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: macallan
Date: Fri Oct 1 21:14:06 UTC 2021
Modified Files:
src/sys/dev/usb: ums.c
Log Message:
use quirk bit for devices that need sc_alwayson instead of adding yet another
if (uha->uiaa->uiaa_vendor == USB_VENDOR_..., remove entries now covered
by UQ_ALWAYS_ON
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/ums.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/ums.c
diff -u src/sys/dev/usb/ums.c:1.100 src/sys/dev/usb/ums.c:1.101
--- src/sys/dev/usb/ums.c:1.100 Wed Feb 3 23:26:08 2021
+++ src/sys/dev/usb/ums.c Fri Oct 1 21:14:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.100 2021/02/03 23:26:08 thorpej Exp $ */
+/* $NetBSD: ums.c,v 1.101 2021/10/01 21:14:06 macallan Exp $ */
/*
* Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.100 2021/02/03 23:26:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.101 2021/10/01 21:14:06 macallan Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -155,6 +155,8 @@ ums_attach(device_t parent, device_t sel
sc->sc_ms.flags |= HIDMS_REVZ;
if (quirks & UQ_SPUR_BUT_UP)
sc->sc_ms.flags |= HIDMS_SPUR_BUT_UP;
+ if (quirks & UQ_ALWAYS_ON)
+ sc->sc_alwayson = true;
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
@@ -201,25 +203,6 @@ ums_attach(device_t parent, device_t sel
}
}
- if (uha->uiaa->uiaa_vendor == USB_VENDOR_HAILUCK &&
- uha->uiaa->uiaa_product == USB_PRODUCT_HAILUCK_KEYBOARD) {
- /*
- * The HAILUCK USB Keyboard has a built-in touchpad, which
- * needs to be active for the keyboard to function properly.
- */
- sc->sc_alwayson = true;
- }
-
- if (uha->uiaa->uiaa_vendor == USB_VENDOR_CHICONY &&
- uha->uiaa->uiaa_product == USB_PRODUCT_CHICONY_OPTMOUSE0939) {
- /*
- * This cheap mouse will disconnect after 60 seconds,
- * reconnect, and then disconnect again (ad nauseum)
- * unless it's kept open.
- */
- sc->sc_alwayson = true;
- }
-
tpcalib_init(>sc_ms.sc_tpcalib);
/* calibrate the pointer if it reports absolute events */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Fri Oct 1 21:09:50 UTC 2021 Modified Files: src/sys/dev/usb: usb_quirks.c usb_quirks.h Log Message: add a quirk for devices that need ums::sc_alwayson To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/usb_quirks.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/usb_quirks.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: macallan
Date: Fri Oct 1 21:09:50 UTC 2021
Modified Files:
src/sys/dev/usb: usb_quirks.c usb_quirks.h
Log Message:
add a quirk for devices that need ums::sc_alwayson
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/usb_quirks.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/usb/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.98 src/sys/dev/usb/usb_quirks.c:1.99
--- src/sys/dev/usb/usb_quirks.c:1.98 Tue Aug 17 22:00:32 2021
+++ src/sys/dev/usb/usb_quirks.c Fri Oct 1 21:09:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.98 2021/08/17 22:00:32 andvar Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.99 2021/10/01 21:09:50 macallan Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.98 2021/08/17 22:00:32 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_quirks.c,v 1.99 2021/10/01 21:09:50 macallan Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -383,6 +383,23 @@ Static const struct usbd_quirk_entry {
{ UQ_DESC_CORRUPT | UQ_MISS_OUT_ACK, desc_pn533 }},
{ USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SCL3712, ANY,
{ UQ_DESC_CORRUPT | UQ_MISS_OUT_ACK, desc_pn533 }},
+
+/*
+ * These cheap mice will disconnect after 60 seconds,
+ * reconnect, and then disconnect again (ad nauseum)
+ * unless it's kept open.
+ */
+ { USB_VENDOR_CHICONY, USB_PRODUCT_CHICONY_OPTMOUSE0939, ANY,
+ { UQ_ALWAYS_ON, NULL }},
+ { USB_VENDOR_PIXART, USB_PRODUCT_PIXART_RPIMOUSE, ANY,
+ { UQ_ALWAYS_ON, NULL }},
+/*
+ * The HAILUCK USB Keyboard has a built-in touchpad, which
+ * needs to be active for the keyboard to function properly.
+ */
+ { USB_VENDOR_HAILUCK, USB_PRODUCT_HAILUCK_KEYBOARD, ANY,
+ { UQ_ALWAYS_ON, NULL }},
+
{ 0, 0, 0, { 0, NULL } }
};
Index: src/sys/dev/usb/usb_quirks.h
diff -u src/sys/dev/usb/usb_quirks.h:1.29 src/sys/dev/usb/usb_quirks.h:1.30
--- src/sys/dev/usb/usb_quirks.h:1.29 Thu Nov 15 02:35:23 2018
+++ src/sys/dev/usb/usb_quirks.h Fri Oct 1 21:09:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.h,v 1.29 2018/11/15 02:35:23 manu Exp $ */
+/* $NetBSD: usb_quirks.h,v 1.30 2021/10/01 21:09:50 macallan Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.h,v 1.9 1999/11/12 23:31:03 n_hibma Exp $ */
/*
@@ -51,6 +51,7 @@ struct usbd_quirks {
#define UQ_APPLE_ISO 0x2 /* force ISO layout on Apple keyboards */
#define UQ_DESC_CORRUPT 0x4 /* may corrupt its config descriptors */
#define UQ_MISS_OUT_ACK 0x8 /* may fail to ack output */
+#define UQ_ALWAYS_ON 0x10 /* for mice that keep disconnecting */
const usb_descriptor_t **desc; /* Replacement for UQ_DESC_CORRUPT */
};
CVS commit: src/sys/dev/usb
Module Name:src Committed By: macallan Date: Fri Oct 1 21:14:06 UTC 2021 Modified Files: src/sys/dev/usb: ums.c Log Message: use quirk bit for devices that need sc_alwayson instead of adding yet another if (uha->uiaa->uiaa_vendor == USB_VENDOR_..., remove entries now covered by UQ_ALWAYS_ON To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/ums.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src Committed By: martin Date: Fri Oct 1 18:18:32 UTC 2021 Modified Files: src/tests/kernel: Makefile Log Message: t_simplehook requires RUMP To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/tests/kernel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src
Committed By: martin
Date: Fri Oct 1 18:18:32 UTC 2021
Modified Files:
src/tests/kernel: Makefile
Log Message:
t_simplehook requires RUMP
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/tests/kernel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.69 src/tests/kernel/Makefile:1.70
--- src/tests/kernel/Makefile:1.69 Thu Sep 30 02:00:20 2021
+++ src/tests/kernel/Makefile Fri Oct 1 18:18:32 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2021/09/30 02:00:20 yamaguchi Exp $
+# $NetBSD: Makefile,v 1.70 2021/10/01 18:18:32 martin Exp $
NOMAN= # defined
@@ -32,7 +32,9 @@ TESTS_SH+= t_origin
TESTS_SH+= t_procpath
TESTS_SH+= t_fexecve
TESTS_SH+= t_fpufork
+.if ${MKRUMP} != "no"
TESTS_SH+= t_simplehook
+.endif
BINDIR= ${TESTSDIR}
PROGS= h_fexecve
