qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

when probing for wsmouse devices, check up to wsmouse9

Browse Source 
ok deraadt
This commit is contained in:
jcs 2019-06-11 14:51:34 +00:00
parent 13cf593b61
commit fa30b33449
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xserver/config/wscons.c
View File

@ -222,7 +222,7 @@ wscons_add_pointers(void)
int fd, i, wsmouse_type;
/* Check pointing devices */
for (i = 0; i < 4; i++) {
for (i = 0; i <= 9; i++) {
snprintf(devnam, sizeof(devnam), "%s%d", WSCONS_MOUSE_PREFIX, i);
LogMessageVerb(X_INFO, 10, "wsmouse: checking %s\n", devnam);
fd = priv_open_device(devnam);

8
xserver/os/privsep.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: privsep.c,v 1.30 2018/10/25 06:41:25 mestre Exp $ */
/* $OpenBSD: privsep.c,v 1.31 2019/06/11 14:51:34 jcs Exp $ */
/*
* Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved.
@ -80,6 +80,12 @@ struct okdev {
{"/dev/wsmouse1", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse2", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse3", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse4", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse5", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse6", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse7", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse8", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/wsmouse9", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/uhid0", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/uhid1", O_RDWR | O_NONBLOCK | O_EXCL},
{"/dev/uhid2", O_RDWR | O_NONBLOCK | O_EXCL},