diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4 index bea73e17af98..8690f3ee31bf 100644 --- a/share/man/man4/man4.i386/mse.4 +++ b/share/man/man4/man4.i386/mse.4 @@ -319,12 +319,6 @@ and may be modifiable. Setting values in the other field does not generate error and has no effect. -.\" .Pp -.\" .It Dv MOUSE_GETVARS Ar mousevar_t *vars -.\" .It Dv MOUSE_SETVARS Ar mousevar_t *vars -.\" These commands are not supported by the -.\" .Nm -.\" driver. .Pp .It Dv MOUSE_READDATA Ar mousedata_t *data .It Dv MOUSE_READSTATE Ar mousedata_t *state diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4 index 1cf7aa2fe51e..299c10b50c46 100644 --- a/share/man/man4/mouse.4 +++ b/share/man/man4/mouse.4 @@ -292,27 +292,6 @@ You may also put zero in and .Dv rate , and the default value for the fields will be selected. -.\" .Pp -.\" .It Dv MOUSE_GETVARS Ar mousevar_t *vars -.\" Get internal variables of the mouse driver. -.\" The variables which can be manipulated through these commands -.\" are specific to each driver. -.\" This command may not be supported by all drivers. -.\" .Bd -literal -.\" typedef struct mousevar { -.\" int var[16]; /* internal variables */ -.\" } mousevar_t; -.\" .Ed -.\" .Pp -.\" If the commands are supported, the first element of the array is -.\" filled with a signature value. -.\" Apart from the signature data, there is currently no standard concerning -.\" the other elements of the buffer. -.\" .Pp -.\" .It Dv MOUSE_SETVARS Ar mousevar_t *vars -.\" Get internal variables of the mouse driver. -.\" The first element of the array must be a signature value. -.\" This command may not be supported by all drivers. .Pp .It Dv MOUSE_READDATA Ar mousedata_t *data The command reads the raw data from the device. diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4 index 42ce3a79d4a6..a116b1916fe0 100644 --- a/share/man/man4/psm.4 +++ b/share/man/man4/psm.4 @@ -591,12 +591,6 @@ You may also put zero in and .Dv rate , and the default value for the fields will be selected. -.\" .Pp -.\" .It Dv MOUSE_GETVARS Ar mousevar_t *vars -.\" .It Dv MOUSE_SETVARS Ar mousevar_t *vars -.\" These commands are not supported by the -.\" .Nm -.\" driver. .Pp .It Dv MOUSE_READDATA Ar mousedata_t *data .\" The command reads the raw data from the device. diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4 index e0329509f853..f57b680c0933 100644 --- a/share/man/man4/sysmouse.4 +++ b/share/man/man4/sysmouse.4 @@ -264,12 +264,6 @@ Only may be modifiable. Setting values in the other field does not generate error and has no effect. -.\" .Pp -.\" .It Dv MOUSE_GETVARS Ar mousevar_t *vars -.\" .It Dv MOUSE_SETVARS Ar mousevar_t *vars -.\" These commands are not supported by the -.\" .Nm -.\" driver. .Pp .It Dv MOUSE_READDATA Ar mousedata_t *data .It Dv MOUSE_READSTATE Ar mousedata_t *state diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 227b73e7088a..4031f2d13b89 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/psm.c @@ -2560,9 +2560,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct psm_softc *sc = dev->si_drv1; mousemode_t mode; mousestatus_t status; -#if (defined(MOUSE_GETVARS)) - mousevar_t *var; -#endif mousedata_t *data; int stat[3]; int command_byte; @@ -2759,21 +2756,6 @@ psmioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, *(mousestatus_t *)addr = status; break; -#if (defined(MOUSE_GETVARS)) - case MOUSE_GETVARS: - var = (mousevar_t *)addr; - bzero(var, sizeof(*var)); - s = spltty(); - var->var[0] = MOUSE_VARS_PS2_SIG; - var->var[1] = sc->config; - var->var[2] = sc->flags; - splx(s); - break; - - case MOUSE_SETVARS: - return (ENODEV); -#endif /* MOUSE_GETVARS */ - case MOUSE_READSTATE: case MOUSE_READDATA: data = (mousedata_t *)addr; diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index 9ce6e702a86a..27a36f219ce0 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -434,12 +434,6 @@ mseioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td case MOUSE_READDATA: return (ENODEV); -#if (defined(MOUSE_GETVARS)) - case MOUSE_GETVARS: - case MOUSE_SETVARS: - return (ENODEV); -#endif - default: return (ENOTTY); } diff --git a/sys/dev/syscons/sysmouse.c b/sys/dev/syscons/sysmouse.c index 8174dd95223d..6197a50d0d0e 100644 --- a/sys/dev/syscons/sysmouse.c +++ b/sys/dev/syscons/sysmouse.c @@ -202,12 +202,6 @@ smdev_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td) mouse_status.dz = 0; return 0; -#ifdef notyet - case MOUSE_GETVARS: /* get internal mouse variables */ - case MOUSE_SETVARS: /* set internal mouse variables */ - return ENODEV; -#endif - case MOUSE_READSTATE: /* read status from the device */ case MOUSE_READDATA: /* read data from the device */ return ENODEV; diff --git a/sys/sys/mouse.h b/sys/sys/mouse.h index a1f950cf10f6..882d59c9243a 100644 --- a/sys/sys/mouse.h +++ b/sys/sys/mouse.h @@ -38,8 +38,6 @@ #define MOUSE_SETMODE _IOW('M', 3, mousemode_t) #define MOUSE_GETLEVEL _IOR('M', 4, int) #define MOUSE_SETLEVEL _IOW('M', 5, int) -#define MOUSE_GETVARS _IOR('M', 6, mousevar_t) -#define MOUSE_SETVARS _IOW('M', 7, mousevar_t) #define MOUSE_READSTATE _IOWR('M', 8, mousedata_t) #define MOUSE_READDATA _IOWR('M', 9, mousedata_t) @@ -228,19 +226,6 @@ typedef struct mousedata { int buf[16]; /* data buffer */ } mousedata_t; -#if (defined(MOUSE_GETVARS)) - -typedef struct mousevar { - int var[16]; -} mousevar_t; - -/* magic numbers in var[0] */ -#define MOUSE_VARS_PS2_SIG 0x00325350 /* 'PS2' */ -#define MOUSE_VARS_BUS_SIG 0x00535542 /* 'BUS' */ -#define MOUSE_VARS_INPORT_SIG 0x00504e49 /* 'INP' */ - -#endif /* MOUSE_GETVARS */ - /* Synaptics Touchpad */ #define MOUSE_SYNAPTICS_PACKETSIZE 6 /* '3' works better */