aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/evdev/evdev.c18
-rw-r--r--sys/dev/evdev/uinput.c2
-rw-r--r--sys/dev/usb/input/ukbd.c24
-rw-r--r--sys/dev/usb/input/ums.c24
4 files changed, 26 insertions, 42 deletions
diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c
index 9b699f5fac01..095552ed26f6 100644
--- a/sys/dev/evdev/evdev.c
+++ b/sys/dev/evdev/evdev.c
@@ -918,22 +918,4 @@ evdev_stop_repeat(struct evdev_dev *evdev)
}
}
-static int
-evdev_modevent(module_t mod, int type, void *unused)
-{
- switch (type) {
- case MOD_LOAD:
- return 0;
- case MOD_UNLOAD:
- return 0;
- }
- return EINVAL;
-}
-
-static moduledata_t evdev_mod = {
- "evdev",
- evdev_modevent,
- 0
-};
-DECLARE_MODULE(evdev, evdev_mod, SI_SUB_DRIVERS, SI_ORDER_ANY);
MODULE_VERSION(evdev, 1);
diff --git a/sys/dev/evdev/uinput.c b/sys/dev/evdev/uinput.c
index ffe94e73aca4..77810b75e230 100644
--- a/sys/dev/evdev/uinput.c
+++ b/sys/dev/evdev/uinput.c
@@ -708,3 +708,5 @@ uinput_modevent(module_t mod __unused, int cmd, void *data)
}
DEV_MODULE(uinput, uinput_modevent, NULL);
+MODULE_VERSION(uinput, 1);
+MODULE_DEPEND(uinput, evdev, 1, 1, 1);
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index fa9c5a01caca..893d46b7e0da 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/quirk/usb_quirk.h>
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
#include <dev/evdev/input.h>
#include <dev/evdev/evdev.h>
#endif
@@ -166,7 +166,7 @@ struct ukbd_softc {
struct usb_device *sc_udev;
struct usb_interface *sc_iface;
struct usb_xfer *sc_xfer[UKBD_N_TRANSFER];
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
struct evdev_dev *sc_evdev;
#endif
@@ -363,7 +363,7 @@ static device_attach_t ukbd_attach;
static device_detach_t ukbd_detach;
static device_resume_t ukbd_resume;
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
static struct evdev_methods ukbd_evdev_methods = {
.ev_event = evdev_ev_kbd_event,
};
@@ -403,7 +403,7 @@ ukbd_put_key(struct ukbd_softc *sc, uint32_t key)
DPRINTF("0x%02x (%d) %s\n", key, key,
(key & KEY_RELEASE) ? "released" : "pressed");
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (evdev_rcpt_mask & EVDEV_RCPT_HW_KBD && sc->sc_evdev != NULL) {
evdev_push_event(sc->sc_evdev, EV_KEY,
evdev_hid2key(KEY_INDEX(key)), !(key & KEY_RELEASE));
@@ -931,7 +931,7 @@ ukbd_set_leds_callback(struct usb_xfer *xfer, usb_error_t error)
if (!any)
break;
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (sc->sc_evdev != NULL)
evdev_push_leds(sc->sc_evdev, sc->sc_leds);
#endif
@@ -1211,7 +1211,7 @@ ukbd_attach(device_t dev)
usb_error_t err;
uint16_t n;
uint16_t hid_len;
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
struct evdev_dev *evdev;
int i;
#endif
@@ -1330,7 +1330,7 @@ ukbd_attach(device_t dev)
}
#endif
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
evdev = evdev_alloc();
evdev_set_name(evdev, device_get_desc(dev));
evdev_set_phys(evdev, device_get_nameunit(dev));
@@ -1431,7 +1431,7 @@ ukbd_detach(device_t dev)
}
#endif
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
evdev_free(sc->sc_evdev);
#endif
@@ -1952,7 +1952,7 @@ ukbd_ioctl_locked(keyboard_t *kbd, u_long cmd, caddr_t arg)
*/
kbd->kb_delay1 = imax(((int *)arg)[0], 250);
kbd->kb_delay2 = imax(((int *)arg)[1], 34);
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (sc->sc_evdev != NULL)
evdev_push_repeats(sc->sc_evdev, kbd);
#endif
@@ -2104,7 +2104,7 @@ ukbd_set_leds(struct ukbd_softc *sc, uint8_t leds)
static int
ukbd_set_typematic(keyboard_t *kbd, int code)
{
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
struct ukbd_softc *sc = kbd->kb_data;
#endif
static const int delays[] = {250, 500, 750, 1000};
@@ -2118,7 +2118,7 @@ ukbd_set_typematic(keyboard_t *kbd, int code)
}
kbd->kb_delay1 = delays[(code >> 5) & 3];
kbd->kb_delay2 = rates[code & 0x1f];
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (sc->sc_evdev != NULL)
evdev_push_repeats(sc->sc_evdev, kbd);
#endif
@@ -2300,7 +2300,7 @@ static driver_t ukbd_driver = {
DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0);
MODULE_DEPEND(ukbd, usb, 1, 1, 1);
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
MODULE_DEPEND(ukbd, evdev, 1, 1, 1);
#endif
MODULE_VERSION(ukbd, 1);
diff --git a/sys/dev/usb/input/ums.c b/sys/dev/usb/input/ums.c
index ac8a08b45c3f..dc7d37786aa3 100644
--- a/sys/dev/usb/input/ums.c
+++ b/sys/dev/usb/input/ums.c
@@ -70,7 +70,7 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/quirk/usb_quirk.h>
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
#include <dev/evdev/input.h>
#include <dev/evdev/evdev.h>
#endif
@@ -142,7 +142,7 @@ struct ums_softc {
int sc_pollrate;
int sc_fflags;
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
int sc_evflags;
#define UMS_EVDEV_OPENED 1
#endif
@@ -151,7 +151,7 @@ struct ums_softc {
uint8_t sc_iid;
uint8_t sc_temp[64];
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
struct evdev_dev *sc_evdev;
#endif
};
@@ -170,7 +170,7 @@ static usb_fifo_open_t ums_fifo_open;
static usb_fifo_close_t ums_fifo_close;
static usb_fifo_ioctl_t ums_fifo_ioctl;
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
static evdev_open_t ums_ev_open;
static evdev_close_t ums_ev_close;
#endif
@@ -190,7 +190,7 @@ static struct usb_fifo_methods ums_fifo_methods = {
.basename[0] = "ums",
};
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
static struct evdev_methods ums_evdev_methods = {
.ev_open = &ums_ev_open,
.ev_close = &ums_ev_close,
@@ -357,7 +357,7 @@ ums_intr_callback(struct usb_xfer *xfer, usb_error_t error)
tr_setup:
/* check if we can put more data into the FIFO */
if (usb_fifo_put_bytes_max(sc->sc_fifo.fp[USB_FIFO_RX]) == 0) {
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (sc->sc_evflags == 0)
break;
#else
@@ -690,7 +690,7 @@ ums_attach(device_t dev)
if (err)
goto detach;
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
sc->sc_evdev = evdev_alloc();
evdev_set_name(sc->sc_evdev, device_get_desc(dev));
evdev_set_phys(sc->sc_evdev, device_get_nameunit(dev));
@@ -750,7 +750,7 @@ ums_detach(device_t self)
usb_fifo_detach(&sc->sc_fifo);
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
evdev_free(sc->sc_evdev);
#endif
@@ -892,7 +892,7 @@ ums_put_queue(struct ums_softc *sc, int32_t dx, int32_t dy,
usb_fifo_put_data_linear(sc->sc_fifo.fp[USB_FIFO_RX], buf,
sc->sc_mode.packetsize, 1);
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (evdev_rcpt_mask & EVDEV_RCPT_HW_MOUSE) {
/* Push evdev event */
evdev_push_event(sc->sc_evdev, EV_REL, REL_X, dx);
@@ -919,7 +919,7 @@ ums_reset_buf(struct ums_softc *sc)
usb_fifo_reset(sc->sc_fifo.fp[USB_FIFO_RX]);
}
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
static int
ums_ev_open(struct evdev_dev *evdev, void *ev_softc)
{
@@ -967,7 +967,7 @@ ums_fifo_open(struct usb_fifo *fifo, int fflags)
return (EBUSY);
/* check for first open */
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
if (sc->sc_fflags == 0 && sc->sc_evflags == 0)
ums_reset(sc);
#else
@@ -1199,7 +1199,7 @@ static driver_t ums_driver = {
DRIVER_MODULE(ums, uhub, ums_driver, ums_devclass, NULL, 0);
MODULE_DEPEND(ums, usb, 1, 1, 1);
-#ifdef EVDEV
+#ifdef EVDEV_SUPPORT
MODULE_DEPEND(ums, evdev, 1, 1, 1);
#endif
MODULE_VERSION(ums, 1);
generated by cgit v1.3 (git 2.53.0) at 2026-09-06 03:35:24 +0000