svn commit: r339564 - in head: . share/man/man4 share/man/man4/man4.i386 share/man/man5 sys/conf sys/dev/mse sys/i386/conf sys/modules sys/modules/mse sys/sys tools/kerneldoc/subsys usr.sbin/bsdcon...
Warner Losh
imp at FreeBSD.org
Mon Oct 22 02:34:14 UTC 2018
Author: imp
Date: Mon Oct 22 02:34:10 2018
New Revision: 339564
URL: https://svnweb.freebsd.org/changeset/base/339564
Log:
Remove mse(4) from tree
Remove mse and all support for bus and inport devices from the tree.
Data from nycbug's dmesg database shows the last sighting of this
driver was in 4.10 on only one machine.
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D17628
Deleted:
head/share/man/man4/man4.i386/mse.4
head/sys/dev/mse/mse.c
head/sys/dev/mse/mse_isa.c
head/sys/dev/mse/msevar.h
head/sys/modules/mse/Makefile
head/tools/kerneldoc/subsys/Doxyfile-dev_mse
Modified:
head/ObsoleteFiles.inc
head/share/man/man4/man4.i386/Makefile
head/share/man/man4/mouse.4
head/share/man/man4/psm.4
head/share/man/man5/rc.conf.5
head/sys/conf/files.i386
head/sys/i386/conf/NOTES
head/sys/modules/Makefile
head/sys/sys/mouse.h
head/usr.sbin/bsdconfig/mouse/include/messages.subr
head/usr.sbin/bsdconfig/mouse/port
head/usr.sbin/moused/moused.8
head/usr.sbin/moused/moused.c
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Mon Oct 22 02:34:00 2018 (r339563)
+++ head/ObsoleteFiles.inc Mon Oct 22 02:34:10 2018 (r339564)
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20181021: mse(4) removal
+OLD_FILES+=usr/share/man/man4/mse.4.gz
# 20181021: joy(4) removal
OLD_FILES+=usr/share/man/man4/joy.4.gz
OLD_FILES+=usr/include/sys/joystick.h
Modified: head/share/man/man4/man4.i386/Makefile
==============================================================================
--- head/share/man/man4/man4.i386/Makefile Mon Oct 22 02:34:00 2018 (r339563)
+++ head/share/man/man4/man4.i386/Makefile Mon Oct 22 02:34:10 2018 (r339564)
@@ -16,7 +16,6 @@ MAN= aic.4 \
glxiic.4 \
glxsb.4 \
longrun.4 \
- mse.4 \
npx.4 \
pae.4 \
pbio.4 \
Modified: head/share/man/man4/mouse.4
==============================================================================
--- head/share/man/man4/mouse.4 Mon Oct 22 02:34:00 2018 (r339563)
+++ head/share/man/man4/mouse.4 Mon Oct 22 02:34:10 2018 (r339564)
@@ -36,7 +36,6 @@
.In sys/mouse.h
.Sh DESCRIPTION
The mouse drivers
-.Xr mse 4 ,
.Xr psm 4 ,
.Xr ums 4
and
@@ -360,8 +359,6 @@ command.
.Bl -tag -width /dev/sysmouseXX -compact
.It Pa /dev/cuau%d
serial ports
-.It Pa /dev/mse%d
-bus and InPort mouse device
.It Pa /dev/psm%d
PS/2 mouse device
.It Pa /dev/sysmouse
@@ -371,7 +368,6 @@ USB mouse device
.El
.Sh SEE ALSO
.Xr ioctl 2 ,
-.Xr mse 4 ,
.Xr psm 4 ,
.Xr sysmouse 4 ,
.Xr ums 4 ,
Modified: head/share/man/man4/psm.4
==============================================================================
--- head/share/man/man4/psm.4 Mon Oct 22 02:34:00 2018 (r339563)
+++ head/share/man/man4/psm.4 Mon Oct 22 02:34:10 2018 (r339564)
@@ -806,7 +806,6 @@ At debug level 2, much more detailed information is lo
.Xr syslog 3 ,
.Xr atkbdc 4 ,
.Xr mouse 4 ,
-.Xr mse 4 ,
.Xr sysmouse 4 ,
.Xr moused 8 ,
.Xr syslogd 8
Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5 Mon Oct 22 02:34:00 2018 (r339563)
+++ head/share/man/man5/rc.conf.5 Mon Oct 22 02:34:10 2018 (r339564)
@@ -3256,11 +3256,9 @@ is set to
this is the actual port the mouse is on.
It might be
.Pa /dev/cuau0
-for a COM1 serial mouse,
+for a COM1 serial mouse, or
.Pa /dev/psm0
-for a PS/2 mouse or
-.Pa /dev/mse0
-for a bus mouse, for example.
+for a PS/2 mouse, for example.
.It Va moused_flags
.Pq Vt str
If
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Mon Oct 22 02:34:00 2018 (r339563)
+++ head/sys/conf/files.i386 Mon Oct 22 02:34:10 2018 (r339564)
@@ -278,8 +278,6 @@ dev/ipmi/ipmi_ssif.c optional ipmi smbus
dev/ipmi/ipmi_pci.c optional ipmi pci
dev/ipmi/ipmi_linux.c optional ipmi compat_linux
dev/le/if_le_isa.c optional le isa
-dev/mse/mse.c optional mse
-dev/mse/mse_isa.c optional mse isa
dev/nctgpio/nctgpio.c optional nctgpio
dev/nfe/if_nfe.c optional nfe pci
dev/ntb/if_ntb/if_ntb.c optional if_ntb
Modified: head/sys/i386/conf/NOTES
==============================================================================
--- head/sys/i386/conf/NOTES Mon Oct 22 02:34:00 2018 (r339563)
+++ head/sys/i386/conf/NOTES Mon Oct 22 02:34:10 2018 (r339564)
@@ -501,14 +501,6 @@ device viadrm # VIA
options DRM_DEBUG # Include debug printfs (slow)
#
-# mse: Logitech and ATI InPort bus mouse ports
-
-device mse
-hint.mse.0.at="isa"
-hint.mse.0.port="0x23c"
-hint.mse.0.irq="5"
-
-#
# Network interfaces:
#
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Mon Oct 22 02:34:00 2018 (r339563)
+++ head/sys/modules/Makefile Mon Oct 22 02:34:10 2018 (r339564)
@@ -260,7 +260,6 @@ SUBDIR= \
mrsas \
msdosfs \
msdosfs_iconv \
- ${_mse} \
msk \
${_mthca} \
mvs \
@@ -761,7 +760,6 @@ _cp= cp
_glxiic= glxiic
_glxsb= glxsb
#_ibcs2= ibcs2
-_mse= mse
_ncr= ncr
_ncv= ncv
_nsp= nsp
Modified: head/sys/sys/mouse.h
==============================================================================
--- head/sys/sys/mouse.h Mon Oct 22 02:34:00 2018 (r339563)
+++ head/sys/sys/mouse.h Mon Oct 22 02:34:10 2018 (r339564)
@@ -141,8 +141,8 @@ typedef struct synapticshw {
/* iftype */
#define MOUSE_IF_UNKNOWN (-1)
#define MOUSE_IF_SERIAL 0
-#define MOUSE_IF_BUS 1
-#define MOUSE_IF_INPORT 2
+/* 1 was bus */
+/* 2 was inport */
#define MOUSE_IF_PS2 3
#define MOUSE_IF_SYSMOUSE 4
#define MOUSE_IF_USB 5
@@ -200,8 +200,8 @@ typedef struct mousemode {
#define MOUSE_PROTO_LOGI 2 /* Logitech, 3 bytes */
#define MOUSE_PROTO_MM 3 /* MM series, 3 bytes */
#define MOUSE_PROTO_LOGIMOUSEMAN 4 /* Logitech MouseMan 3/4 bytes */
-#define MOUSE_PROTO_BUS 5 /* MS/Logitech bus mouse */
-#define MOUSE_PROTO_INPORT 6 /* MS/ATI InPort mouse */
+/* 5 was bus mouse */
+/* 6 was inport mosue */
#define MOUSE_PROTO_PS2 7 /* PS/2 mouse, 3 bytes */
#define MOUSE_PROTO_HITTAB 8 /* Hitachi Tablet 3 bytes */
#define MOUSE_PROTO_GLIDEPOINT 9 /* ALPS GlidePoint, 3/4 bytes */
Modified: head/usr.sbin/bsdconfig/mouse/include/messages.subr
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/include/messages.subr Mon Oct 22 02:34:00 2018 (r339563)
+++ head/usr.sbin/bsdconfig/mouse/include/messages.subr Mon Oct 22 02:34:10 2018 (r339564)
@@ -27,8 +27,6 @@
hline_press_enter_or_space="Press enter or space"
msg_auto="Auto"
msg_auto_desc="Bus mouse, PS/2 style mouse or PnP serial mouse"
-msg_busmouse="BusMouse"
-msg_busmouse_desc="Logitech, ATI or MS bus mouse (/dev/mse0)"
msg_cancel="Cancel"
msg_com1="COM1"
msg_com1_desc="Serial mouse on COM1 (/dev/cuau0)"
Modified: head/usr.sbin/bsdconfig/mouse/port
==============================================================================
--- head/usr.sbin/bsdconfig/mouse/port Mon Oct 22 02:34:00 2018 (r339563)
+++ head/usr.sbin/bsdconfig/mouse/port Mon Oct 22 02:34:10 2018 (r339564)
@@ -56,7 +56,6 @@ dialog_menu_main()
'3 $msg_com2' '$msg_com2_desc'
'4 $msg_com3' '$msg_com3_desc'
'5 $msg_com4' '$msg_com4_desc'
- '6 $msg_busmouse' '$msg_busmouse_desc'
" # END-QUOTE
local defaultitem= # Calculated below
local hline=
@@ -75,7 +74,6 @@ dialog_menu_main()
/dev/cuau1) defaultitem="3 $msg_com2" ;;
/dev/cuau2) defaultitem="4 $msg_com3" ;;
/dev/cuau3) defaultitem="5 $msg_com4" ;;
- /dev/mse0) defaultitem="6 $msg_busmouse" ;;
esac
local menu_choice
@@ -136,8 +134,6 @@ case "$mtag" in
moused_port_to_set="/dev/cuau2" ;;
"5 $msg_com4") # Serial mouse on COM4 (/dev/cuau3)
moused_port_to_set="/dev/cuau3" ;;
-"6 $msg_busmouse") # Logitech, ATI or MS bus mouse (/dev/mse0)
- moused_port_to_set="/dev/mse0" ;;
esac
if [ "$moused_port_to_set" ]; then
Modified: head/usr.sbin/moused/moused.8
==============================================================================
--- head/usr.sbin/moused/moused.8 Mon Oct 22 02:34:00 2018 (r339563)
+++ head/usr.sbin/moused/moused.8 Mon Oct 22 02:34:10 2018 (r339564)
@@ -297,7 +297,6 @@ information are:
.It Ar port
Port (device file) name, i.e.\&
.Pa /dev/cuau0 ,
-.Pa /dev/mse0
and
.Pa /dev/psm0 .
.It Ar if
@@ -555,10 +554,7 @@ what matters.
The USB mouse has a flat rectangular connector.
.Pp
The next thing to decide is a port to use for the given interface.
-For the bus, InPort and PS/2 mice, there is little choice:
-the bus and InPort mice always use
-.Pa /dev/mse0 ,
-and the PS/2 mouse is always at
+The PS/2 mouse is always at
.Pa /dev/psm0 .
There may be more than one serial port to which the serial
mouse can be attached.
@@ -713,8 +709,6 @@ the mice is combined all together.
.Bl -tag -width /dev/consolectl -compact
.It Pa /dev/consolectl
device to control the console
-.It Pa /dev/mse%d
-bus and InPort mouse driver
.It Pa /dev/psm%d
PS/2 mouse driver
.It Pa /dev/sysmouse
@@ -792,7 +786,6 @@ you keep brushing over the mouse pad while typing.
.Xr vidcontrol 1 ,
.Xr xset 1 ,
.Xr keyboard 4 ,
-.Xr mse 4 ,
.Xr psm 4 ,
.Xr screen 4 ,
.Xr sysmouse 4 ,
Modified: head/usr.sbin/moused/moused.c
==============================================================================
--- head/usr.sbin/moused/moused.c Mon Oct 22 02:34:00 2018 (r339563)
+++ head/usr.sbin/moused/moused.c Mon Oct 22 02:34:10 2018 (r339564)
@@ -198,8 +198,6 @@ static int hscroll_movement;
/* interface (the table must be ordered by MOUSE_IF_XXX in mouse.h) */
static symtab_t rifs[] = {
{ "serial", MOUSE_IF_SERIAL, 0 },
- { "bus", MOUSE_IF_BUS, 0 },
- { "inport", MOUSE_IF_INPORT, 0 },
{ "ps/2", MOUSE_IF_PS2, 0 },
{ "sysmouse", MOUSE_IF_SYSMOUSE, 0 },
{ "usb", MOUSE_IF_USB, 0 },
@@ -213,8 +211,8 @@ static const char *rnames[] = {
"logitech",
"mmseries",
"mouseman",
- "busmouse",
- "inportmouse",
+ "wasbusmouse",
+ "wasinportmouse",
"ps/2",
"mmhitab",
"glidepoint",
@@ -290,12 +288,8 @@ static symtab_t pnpprod[] = {
/* Mitsumi Wireless Scroll Mouse */
{ "MTM6401", MOUSE_PROTO_INTELLI, MOUSE_MODEL_INTELLI },
- /* MS bus */
- { "PNP0F00", MOUSE_PROTO_BUS, MOUSE_MODEL_GENERIC },
/* MS serial */
{ "PNP0F01", MOUSE_PROTO_MS, MOUSE_MODEL_GENERIC },
- /* MS InPort */
- { "PNP0F02", MOUSE_PROTO_INPORT, MOUSE_MODEL_GENERIC },
/* MS PS/2 */
{ "PNP0F03", MOUSE_PROTO_PS2, MOUSE_MODEL_GENERIC },
/*
@@ -322,8 +316,6 @@ static symtab_t pnpprod[] = {
{ "PNP0F0B", MOUSE_PROTO_MS, MOUSE_MODEL_GENERIC },
/* MS serial comatible */
{ "PNP0F0C", MOUSE_PROTO_MS, MOUSE_MODEL_GENERIC },
- /* MS InPort comatible */
- { "PNP0F0D", MOUSE_PROTO_INPORT, MOUSE_MODEL_GENERIC },
/* MS PS/2 comatible */
{ "PNP0F0E", MOUSE_PROTO_PS2, MOUSE_MODEL_GENERIC },
/* MS BallPoint comatible */
@@ -332,8 +324,6 @@ static symtab_t pnpprod[] = {
/* TI QuickPort */
{ "PNP0F10", MOUSE_PROTO_XXX, MOUSE_MODEL_GENERIC },
#endif
- /* MS bus comatible */
- { "PNP0F11", MOUSE_PROTO_BUS, MOUSE_MODEL_GENERIC },
/* Logitech PS/2 */
{ "PNP0F12", MOUSE_PROTO_PS2, MOUSE_MODEL_GENERIC },
/* PS/2 */
@@ -342,16 +332,12 @@ static symtab_t pnpprod[] = {
/* MS Kids Mouse */
{ "PNP0F14", MOUSE_PROTO_XXX, MOUSE_MODEL_GENERIC },
#endif
- /* Logitech bus */
- { "PNP0F15", MOUSE_PROTO_BUS, MOUSE_MODEL_GENERIC },
#if notyet
/* Logitech SWIFT */
{ "PNP0F16", MOUSE_PROTO_XXX, MOUSE_MODEL_GENERIC },
#endif
/* Logitech serial compat */
{ "PNP0F17", MOUSE_PROTO_LOGIMOUSEMAN, MOUSE_MODEL_GENERIC },
- /* Logitech bus compatible */
- { "PNP0F18", MOUSE_PROTO_BUS, MOUSE_MODEL_GENERIC },
/* Logitech PS/2 compatible */
{ "PNP0F19", MOUSE_PROTO_PS2, MOUSE_MODEL_GENERIC },
#if notyet
@@ -860,15 +846,6 @@ main(int argc, char *argv[])
/* the default port name */
switch(rodent.rtype) {
- case MOUSE_PROTO_INPORT:
- /* INPORT and BUS are the same... */
- rodent.rtype = MOUSE_PROTO_BUS;
- /* FALLTHROUGH */
- case MOUSE_PROTO_BUS:
- if (!rodent.portname)
- rodent.portname = "/dev/mse0";
- break;
-
case MOUSE_PROTO_PS2:
if (!rodent.portname)
rodent.portname = "/dev/psm0";
@@ -1519,9 +1496,6 @@ r_identify(void)
logwarnx("unknown mouse protocol (%d)", rodent.mode.protocol);
return (MOUSE_PROTO_UNKNOWN);
} else {
- /* INPORT and BUS are the same... */
- if (rodent.mode.protocol == MOUSE_PROTO_INPORT)
- rodent.mode.protocol = MOUSE_PROTO_BUS;
if (rodent.mode.protocol != rodent.rtype) {
/* Hmm, the driver doesn't agree with the user... */
if (rodent.rtype != MOUSE_PROTO_UNKNOWN)
@@ -1559,8 +1533,6 @@ r_identify(void)
} else {
rodent.mode.protocol = MOUSE_PROTO_UNKNOWN;
}
- if (rodent.mode.protocol == MOUSE_PROTO_INPORT)
- rodent.mode.protocol = MOUSE_PROTO_BUS;
/* make final adjustment */
if (rodent.mode.protocol != MOUSE_PROTO_UNKNOWN) {
@@ -1771,8 +1743,6 @@ r_init(void)
setmousespeed(1200, rodent.baudrate, rodentcflags[rodent.rtype]);
/* FALLTHROUGH */
- case MOUSE_PROTO_BUS:
- case MOUSE_PROTO_INPORT:
case MOUSE_PROTO_PS2:
if (rodent.rate >= 0)
rodent.mode.rate = rodent.rate;
@@ -2160,13 +2130,6 @@ r_protocol(u_char rBuf, mousestatus_t *act)
}
prev_x = x;
prev_y = y;
- break;
-
- case MOUSE_PROTO_BUS: /* Bus */
- case MOUSE_PROTO_INPORT: /* InPort */
- act->button = butmapmsc[(~pBuf[0]) & MOUSE_MSC_BUTTONS];
- act->dx = (signed char)pBuf[1];
- act->dy = - (signed char)pBuf[2];
break;
case MOUSE_PROTO_PS2: /* PS/2 */
More information about the svn-src-all
mailing list