mherrb/seatd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wscons: Move to its own device type

Browse source 
This reduces ifdefs and avoids overloading evdev as something it is not.
This commit is contained in:
Kenny Levinsen 2022-03-29 10:41:16 +02:00
parent 684dd61945
commit 0462e9331d
7 changed files with 51 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

26
common/evdev.c
View file

@ -9,11 +9,6 @@
#include <sys/sysmacros.h>
#elif defined(__FreeBSD__)
#include <dev/evdev/input.h>
#elif defined(__NetBSD__)
#include <stdlib.h>
#include <sys/stat.h>
#else
#error Unsupported platform
#endif
#include "evdev.h"
@ -30,28 +25,15 @@ int path_is_evdev(const char *path) {
int evdev_revoke(int fd) {
return ioctl(fd, EVIOCREVOKE, NULL);
}
#endif
#if defined(__linux__)
int dev_is_evdev(dev_t device) {
return major(device) == INPUT_MAJOR;
}
#elif defined(__NetBSD__)
int dev_is_evdev(dev_t device) {
return major(device) == getdevmajor("wskbd", S_IFCHR) ||
major(device) == getdevmajor("wsmouse", S_IFCHR) ||
major(device) == getdevmajor("wsmux", S_IFCHR);
}
int path_is_evdev(const char *path) {
const char *wskbd = "/dev/wskbd";
const char *wsmouse = "/dev/wsmouse";
const char *wsmux = "/dev/wsmux";
return strncmp(path, wskbd, STRLEN(wskbd)) == 0 ||
strncmp(path, wsmouse, STRLEN(wsmouse)) == 0 ||
strncmp(path, wsmux, STRLEN(wsmouse)) == 0;
(void)path;
return 0;
}
int evdev_revoke(int fd) {
(void)fd;
return 0;
}
#else
#error Unsupported platform
#endif

27
common/wscons.c Normal file
View file

@ -0,0 +1,27 @@
#include <stdlib.h>
#include <string.h>
#if defined(__NetBSD__)
#include <stdlib.h>
#include <sys/stat.h>
#endif
#include "wscons.h"
#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
#if defined(__NetBSD__)
int path_is_wscons(const char *path) {
const char *wskbd = "/dev/wskbd";
const char *wsmouse = "/dev/wsmouse";
const char *wsmux = "/dev/wsmux";
return strncmp(path, wskbd, STRLEN(wskbd)) == 0 ||
strncmp(path, wsmouse, STRLEN(wsmouse)) == 0 ||
strncmp(path, wsmux, STRLEN(wsmouse)) == 0;
}
#else
int path_is_wscons(const char *path) {
(void)path;
return 0;
}
#endif