From 627702456fbcd9eec7cc73ce0a0c4b527af0b188 Mon Sep 17 00:00:00 2001 From: Antonio Huete Jimenez Date: Tue, 12 Oct 2010 01:11:07 +0200 Subject: [PATCH] mouse.h - Change to be not per-architecture. As mouse.h was the same file in both architectures, and there is no reason to have it per-platform, it has been put in sys/ --- share/man/man4/man4.i386/mse.4 | 2 +- share/man/man4/mouse.4 | 2 +- share/man/man4/psm.4 | 2 +- share/man/man4/sysmouse.4 | 2 +- sys/dev/misc/mse/mse.c | 2 +- sys/dev/misc/syscons/scmouse.c | 2 +- sys/dev/misc/syscons/sysmouse.c | 2 +- sys/dev/usbmisc/ums/ums.c | 2 +- sys/platform/pc64/include/mouse.h | 337 --------------------- sys/{platform/pc32/include => sys}/mouse.h | 13 +- usr.sbin/moused/moused.c | 2 +- 11 files changed, 15 insertions(+), 353 deletions(-) delete mode 100644 sys/platform/pc64/include/mouse.h rename sys/{platform/pc32/include => sys}/mouse.h (97%) diff --git a/share/man/man4/man4.i386/mse.4 b/share/man/man4/man4.i386/mse.4 index a57982d794..b9821364bd 100644 --- a/share/man/man4/man4.i386/mse.4 +++ b/share/man/man4/man4.i386/mse.4 @@ -154,7 +154,7 @@ There are a few .Xr ioctl 2 commands for mouse drivers. These commands and related structures and constants are defined in -.In machine/mouse.h . +.In sys/mouse.h . General description of the commands is given in .Xr mouse 4 . This section explains the features specific to the diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4 index 2aa8ed7970..f2f86c43fe 100644 --- a/share/man/man4/mouse.4 +++ b/share/man/man4/mouse.4 @@ -34,7 +34,7 @@ .Nm mouse .Nd mouse and pointing device drivers .Sh SYNOPSIS -.In machine/mouse.h +.In sys/mouse.h .Sh DESCRIPTION The mouse drivers .Xr mse 4 , diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4 index a2c521f924..e0cf0312a6 100644 --- a/share/man/man4/psm.4 +++ b/share/man/man4/psm.4 @@ -348,7 +348,7 @@ There are a few .Xr ioctl 2 commands for mouse drivers. These commands and related structures and constants are defined in -.In machine/mouse.h . +.In sys/mouse.h . General description of the commands is given in .Xr mouse 4 . This section explains the features specific to the diff --git a/share/man/man4/sysmouse.4 b/share/man/man4/sysmouse.4 index 9595ad2cda..c915b741b3 100644 --- a/share/man/man4/sysmouse.4 +++ b/share/man/man4/sysmouse.4 @@ -36,7 +36,7 @@ .\" .Nd supplies mouse data from syscons for other applications .Nd virtualized mouse driver .Sh SYNOPSIS -.In machine/mouse.h +.In sys/mouse.h .In machine/console.h .Sh DESCRIPTION The console driver, in conjunction with the mouse daemon diff --git a/sys/dev/misc/mse/mse.c b/sys/dev/misc/mse/mse.c index abd5c2d35a..310a909ed5 100644 --- a/sys/dev/misc/mse/mse.c +++ b/sys/dev/misc/mse/mse.c @@ -57,7 +57,7 @@ #include #include -#include +#include #include diff --git a/sys/dev/misc/syscons/scmouse.c b/sys/dev/misc/syscons/scmouse.c index 0a8133267c..6f23c8c5c0 100644 --- a/sys/dev/misc/syscons/scmouse.c +++ b/sys/dev/misc/syscons/scmouse.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include "syscons.h" diff --git a/sys/dev/misc/syscons/sysmouse.c b/sys/dev/misc/syscons/sysmouse.c index 52cbfcf80b..b8e6825e42 100644 --- a/sys/dev/misc/syscons/sysmouse.c +++ b/sys/dev/misc/syscons/sysmouse.c @@ -45,7 +45,7 @@ #include #include -#include +#include #include "syscons.h" diff --git a/sys/dev/usbmisc/ums/ums.c b/sys/dev/usbmisc/ums/ums.c index ace91b2177..d9c81c5348 100644 --- a/sys/dev/usbmisc/ums/ums.c +++ b/sys/dev/usbmisc/ums/ums.c @@ -67,7 +67,7 @@ #include #include -#include +#include #ifdef USB_DEBUG #define DPRINTF(x) if (umsdebug) kprintf x diff --git a/sys/platform/pc64/include/mouse.h b/sys/platform/pc64/include/mouse.h deleted file mode 100644 index 7b7cab9ab0..0000000000 --- a/sys/platform/pc64/include/mouse.h +++ /dev/null @@ -1,337 +0,0 @@ -/*- - * Copyright (c) 1992, 1993 Erik Forsberg. - * Copyright (c) 1996, 1997 Kazutaka YOKOTA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * THIS SOFTWARE IS PROVIDED BY ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL I BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD: src/sys/i386/include/mouse.h,v 1.15.2.2 2002/04/15 00:52:08 will Exp $ - * $DragonFly: src/sys/platform/pc64/include/mouse.h,v 1.1 2007/08/21 19:45:45 corecode Exp $ - */ - -#ifndef _MACHINE_MOUSE_H_ -#define _MACHINE_MOUSE_H_ - -#include -#include - -/* ioctls */ -#define MOUSE_GETSTATUS _IOR('M', 0, mousestatus_t) -#define MOUSE_GETHWINFO _IOR('M', 1, mousehw_t) -#define MOUSE_GETMODE _IOR('M', 2, mousemode_t) -#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) - -#if notyet -#define MOUSE_SETRESOLUTION _IOW('M', 10, int) -#define MOUSE_SETSCALING _IOW('M', 11, int) -#define MOUSE_SETRATE _IOW('M', 12, int) -#define MOUSE_GETHWID _IOR('M', 13, int) -#endif - -/* mouse status block */ -typedef struct mousestatus { - int flags; /* state change flags */ - int button; /* button status */ - int obutton; /* previous button status */ - int dx; /* x movement */ - int dy; /* y movement */ - int dz; /* z movement */ -} mousestatus_t; - -/* button */ -#define MOUSE_BUTTON1DOWN 0x0001 /* left */ -#define MOUSE_BUTTON2DOWN 0x0002 /* middle */ -#define MOUSE_BUTTON3DOWN 0x0004 /* right */ -#define MOUSE_BUTTON4DOWN 0x0008 -#define MOUSE_BUTTON5DOWN 0x0010 -#define MOUSE_BUTTON6DOWN 0x0020 -#define MOUSE_BUTTON7DOWN 0x0040 -#define MOUSE_BUTTON8DOWN 0x0080 -#define MOUSE_MAXBUTTON 31 -#define MOUSE_STDBUTTONS 0x0007 /* buttons 1-3 */ -#define MOUSE_EXTBUTTONS 0x7ffffff8 /* the others (28 of them!) */ -#define MOUSE_BUTTONS (MOUSE_STDBUTTONS | MOUSE_EXTBUTTONS) - -/* flags */ -#define MOUSE_STDBUTTONSCHANGED MOUSE_STDBUTTONS -#define MOUSE_EXTBUTTONSCHANGED MOUSE_EXTBUTTONS -#define MOUSE_BUTTONSCHANGED MOUSE_BUTTONS -#define MOUSE_POSCHANGED 0x80000000 - -typedef struct mousehw { - int buttons; /* -1 if unknown */ - int iftype; /* MOUSE_IF_XXX */ - int type; /* mouse/track ball/pad... */ - int model; /* I/F dependent model ID: MOUSE_MODEL_XXX */ - int hwid; /* I/F dependent hardware ID - * for the PS/2 mouse, it will be PSM_XXX_ID - */ -} mousehw_t; - -/* iftype */ -#define MOUSE_IF_UNKNOWN (-1) -#define MOUSE_IF_SERIAL 0 -#define MOUSE_IF_BUS 1 -#define MOUSE_IF_INPORT 2 -#define MOUSE_IF_PS2 3 -#define MOUSE_IF_SYSMOUSE 4 -#define MOUSE_IF_USB 5 - -/* type */ -#define MOUSE_UNKNOWN (-1) /* should be treated as a mouse */ -#define MOUSE_MOUSE 0 -#define MOUSE_TRACKBALL 1 -#define MOUSE_STICK 2 -#define MOUSE_PAD 3 - -/* model */ -#define MOUSE_MODEL_UNKNOWN (-1) -#define MOUSE_MODEL_GENERIC 0 -#define MOUSE_MODEL_GLIDEPOINT 1 -#define MOUSE_MODEL_NETSCROLL 2 -#define MOUSE_MODEL_NET 3 -#define MOUSE_MODEL_INTELLI 4 -#define MOUSE_MODEL_THINK 5 -#define MOUSE_MODEL_EASYSCROLL 6 -#define MOUSE_MODEL_MOUSEMANPLUS 7 -#define MOUSE_MODEL_KIDSPAD 8 -#define MOUSE_MODEL_VERSAPAD 9 -#define MOUSE_MODEL_EXPLORER 10 -#define MOUSE_MODEL_4D 11 -#define MOUSE_MODEL_4DPLUS 12 - -typedef struct mousemode { - int protocol; /* MOUSE_PROTO_XXX */ - int rate; /* report rate (per sec), -1 if unknown */ - int resolution; /* MOUSE_RES_XXX, -1 if unknown */ - int accelfactor; /* accelation factor (must be 1 or greater) */ - int level; /* driver operation level */ - int packetsize; /* the length of the data packet */ - unsigned char syncmask[2]; /* sync. data bits in the header byte */ -} mousemode_t; - -/* protocol */ -/* - * Serial protocols: - * Microsoft, MouseSystems, Logitech, MM series, MouseMan, Hitachi Tablet, - * GlidePoint, IntelliMouse, Thinking Mouse, MouseRemote, Kidspad, - * VersaPad - * Bus mouse protocols: - * bus, InPort - * PS/2 mouse protocol: - * PS/2 - */ -#define MOUSE_PROTO_UNKNOWN (-1) -#define MOUSE_PROTO_MS 0 /* Microsoft Serial, 3 bytes */ -#define MOUSE_PROTO_MSC 1 /* Mouse Systems, 5 bytes */ -#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 */ -#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 */ -#define MOUSE_PROTO_INTELLI 10 /* MS IntelliMouse, 4 bytes */ -#define MOUSE_PROTO_THINK 11 /* Kensignton Thinking Mouse, 3/4 bytes */ -#define MOUSE_PROTO_SYSMOUSE 12 /* /dev/sysmouse */ -#define MOUSE_PROTO_X10MOUSEREM 13 /* X10 MouseRemote, 3 bytes */ -#define MOUSE_PROTO_KIDSPAD 14 /* Genius Kidspad */ -#define MOUSE_PROTO_VERSAPAD 15 /* Interlink VersaPad, 6 bytes */ -#define MOUSE_PROTO_JOGDIAL 16 /* Vaio's JogDial */ - -#define MOUSE_RES_UNKNOWN (-1) -#define MOUSE_RES_DEFAULT 0 -#define MOUSE_RES_LOW (-2) -#define MOUSE_RES_MEDIUMLOW (-3) -#define MOUSE_RES_MEDIUMHIGH (-4) -#define MOUSE_RES_HIGH (-5) - -typedef struct mousedata { - int len; /* # of data in the buffer */ - 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 */ - -/* Microsoft Serial mouse data packet */ -#define MOUSE_MSS_PACKETSIZE 3 -#define MOUSE_MSS_SYNCMASK 0x40 -#define MOUSE_MSS_SYNC 0x40 -#define MOUSE_MSS_BUTTONS 0x30 -#define MOUSE_MSS_BUTTON1DOWN 0x20 /* left */ -#define MOUSE_MSS_BUTTON2DOWN 0x00 /* no middle button */ -#define MOUSE_MSS_BUTTON3DOWN 0x10 /* right */ - -/* Logitech MouseMan data packet (M+ protocol) */ -#define MOUSE_LMAN_BUTTON2DOWN 0x20 /* middle button, the 4th byte */ - -/* ALPS GlidePoint extention (variant of M+ protocol) */ -#define MOUSE_ALPS_BUTTON2DOWN 0x20 /* middle button, the 4th byte */ -#define MOUSE_ALPS_TAP 0x10 /* `tapping' action, the 4th byte */ - -/* Kinsington Thinking Mouse extention (variant of M+ protocol) */ -#define MOUSE_THINK_BUTTON2DOWN 0x20 /* lower-left button, the 4th byte */ -#define MOUSE_THINK_BUTTON4DOWN 0x10 /* lower-right button, the 4th byte */ - -/* MS IntelliMouse (variant of MS Serial) */ -#define MOUSE_INTELLI_PACKETSIZE 4 -#define MOUSE_INTELLI_BUTTON2DOWN 0x10 /* middle button in the 4th byte */ - -/* Mouse Systems Corp. mouse data packet */ -#define MOUSE_MSC_PACKETSIZE 5 -#define MOUSE_MSC_SYNCMASK 0xf8 -#define MOUSE_MSC_SYNC 0x80 -#define MOUSE_MSC_BUTTONS 0x07 -#define MOUSE_MSC_BUTTON1UP 0x04 /* left */ -#define MOUSE_MSC_BUTTON2UP 0x02 /* middle */ -#define MOUSE_MSC_BUTTON3UP 0x01 /* right */ -#define MOUSE_MSC_MAXBUTTON 3 - -/* MM series mouse data packet */ -#define MOUSE_MM_PACKETSIZE 3 -#define MOUSE_MM_SYNCMASK 0xe0 -#define MOUSE_MM_SYNC 0x80 -#define MOUSE_MM_BUTTONS 0x07 -#define MOUSE_MM_BUTTON1DOWN 0x04 /* left */ -#define MOUSE_MM_BUTTON2DOWN 0x02 /* middle */ -#define MOUSE_MM_BUTTON3DOWN 0x01 /* right */ -#define MOUSE_MM_XPOSITIVE 0x10 -#define MOUSE_MM_YPOSITIVE 0x08 - -/* PS/2 mouse data packet */ -#define MOUSE_PS2_PACKETSIZE 3 -#define MOUSE_PS2_SYNCMASK 0xc8 -#define MOUSE_PS2_SYNC 0x08 -#define MOUSE_PS2_BUTTONS 0x07 /* 0x03 for 2 button mouse */ -#define MOUSE_PS2_BUTTON1DOWN 0x01 /* left */ -#define MOUSE_PS2_BUTTON2DOWN 0x04 /* middle */ -#define MOUSE_PS2_BUTTON3DOWN 0x02 /* right */ -#define MOUSE_PS2_TAP MOUSE_PS2_SYNC /* GlidePoint (PS/2) `tapping' - * Yes! this is the same bit - * as SYNC! - */ - -#define MOUSE_PS2_XNEG 0x10 -#define MOUSE_PS2_YNEG 0x20 -#define MOUSE_PS2_XOVERFLOW 0x40 -#define MOUSE_PS2_YOVERFLOW 0x80 - -/* Logitech MouseMan+ (PS/2) data packet (PS/2++ protocol) */ -#define MOUSE_PS2PLUS_SYNCMASK 0x48 -#define MOUSE_PS2PLUS_SYNC 0x48 -#define MOUSE_PS2PLUS_ZNEG 0x08 /* sign bit */ -#define MOUSE_PS2PLUS_BUTTON4DOWN 0x10 /* 4th button on MouseMan+ */ -#define MOUSE_PS2PLUS_BUTTON5DOWN 0x20 - -/* IBM ScrollPoint (PS/2) also uses PS/2++ protocol */ -#define MOUSE_SPOINT_ZNEG 0x80 /* sign bits */ -#define MOUSE_SPOINT_WNEG 0x08 - -/* MS IntelliMouse (PS/2) data packet */ -#define MOUSE_PS2INTELLI_PACKETSIZE 4 -/* some compatible mice have additional buttons */ -#define MOUSE_PS2INTELLI_BUTTON4DOWN 0x40 -#define MOUSE_PS2INTELLI_BUTTON5DOWN 0x80 - -/* MS IntelliMouse Explorer (PS/2) data packet (variation of IntelliMouse) */ -#define MOUSE_EXPLORER_ZNEG 0x08 /* sign bit */ -/* IntelliMouse Explorer has additional button data in the fourth byte */ -#define MOUSE_EXPLORER_BUTTON4DOWN 0x10 -#define MOUSE_EXPLORER_BUTTON5DOWN 0x20 - -/* Interlink VersaPad (serial I/F) data packet */ -#define MOUSE_VERSA_PACKETSIZE 6 -#define MOUSE_VERSA_IN_USE 0x04 -#define MOUSE_VERSA_SYNCMASK 0xc3 -#define MOUSE_VERSA_SYNC 0xc0 -#define MOUSE_VERSA_BUTTONS 0x30 -#define MOUSE_VERSA_BUTTON1DOWN 0x20 /* left */ -#define MOUSE_VERSA_BUTTON2DOWN 0x00 /* middle */ -#define MOUSE_VERSA_BUTTON3DOWN 0x10 /* right */ -#define MOUSE_VERSA_TAP 0x08 - -/* Interlink VersaPad (PS/2 I/F) data packet */ -#define MOUSE_PS2VERSA_PACKETSIZE 6 -#define MOUSE_PS2VERSA_IN_USE 0x10 -#define MOUSE_PS2VERSA_SYNCMASK 0xe8 -#define MOUSE_PS2VERSA_SYNC 0xc8 -#define MOUSE_PS2VERSA_BUTTONS 0x05 -#define MOUSE_PS2VERSA_BUTTON1DOWN 0x04 /* left */ -#define MOUSE_PS2VERSA_BUTTON2DOWN 0x00 /* middle */ -#define MOUSE_PS2VERSA_BUTTON3DOWN 0x01 /* right */ -#define MOUSE_PS2VERSA_TAP 0x02 - -/* A4 Tech 4D Mouse (PS/2) data packet */ -#define MOUSE_4D_PACKETSIZE 3 -#define MOUSE_4D_WHEELBITS 0xf0 - -/* A4 Tech 4D+ Mouse (PS/2) data packet */ -#define MOUSE_4DPLUS_PACKETSIZE 3 -#define MOUSE_4DPLUS_ZNEG 0x04 /* sign bit */ -#define MOUSE_4DPLUS_BUTTON4DOWN 0x08 - -/* sysmouse extended data packet */ -/* - * /dev/sysmouse sends data in two formats, depending on the protocol - * level. At the level 0, format is exactly the same as MousSystems' - * five byte packet. At the level 1, the first five bytes are the same - * as at the level 0. There are additional three bytes which shows - * `dz' and the states of additional buttons. `dz' is expressed as the - * sum of the byte 5 and 6 which contain signed seven bit values. - * The states of the button 4 though 10 are in the bit 0 though 6 in - * the byte 7 respectively: 1 indicates the button is up. - */ -#define MOUSE_SYS_PACKETSIZE 8 -#define MOUSE_SYS_SYNCMASK 0xf8 -#define MOUSE_SYS_SYNC 0x80 -#define MOUSE_SYS_BUTTON1UP 0x04 /* left, 1st byte */ -#define MOUSE_SYS_BUTTON2UP 0x02 /* middle, 1st byte */ -#define MOUSE_SYS_BUTTON3UP 0x01 /* right, 1st byte */ -#define MOUSE_SYS_BUTTON4UP 0x0001 /* 7th byte */ -#define MOUSE_SYS_BUTTON5UP 0x0002 -#define MOUSE_SYS_BUTTON6UP 0x0004 -#define MOUSE_SYS_BUTTON7UP 0x0008 -#define MOUSE_SYS_BUTTON8UP 0x0010 -#define MOUSE_SYS_BUTTON9UP 0x0020 -#define MOUSE_SYS_BUTTON10UP 0x0040 -#define MOUSE_SYS_MAXBUTTON 10 -#define MOUSE_SYS_STDBUTTONS 0x07 -#define MOUSE_SYS_EXTBUTTONS 0x7f /* the others */ - -/* Mouse remote socket */ -#define _PATH_MOUSEREMOTE "/var/run/MouseRemote" - -#endif /* _MACHINE_MOUSE_H_ */ diff --git a/sys/platform/pc32/include/mouse.h b/sys/sys/mouse.h similarity index 97% rename from sys/platform/pc32/include/mouse.h rename to sys/sys/mouse.h index 92d6733a3c..599c5f5ec5 100644 --- a/sys/platform/pc32/include/mouse.h +++ b/sys/sys/mouse.h @@ -21,7 +21,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/include/mouse.h,v 1.15.2.2 2002/04/15 00:52:08 will Exp $ - * $DragonFly: src/sys/platform/pc32/include/mouse.h,v 1.2 2003/06/17 04:28:35 dillon Exp $ */ #ifndef _MACHINE_MOUSE_H_ @@ -85,7 +84,7 @@ typedef struct mousehw { int type; /* mouse/track ball/pad... */ int model; /* I/F dependent model ID: MOUSE_MODEL_XXX */ int hwid; /* I/F dependent hardware ID - * for the PS/2 mouse, it will be PSM_XXX_ID + * for the PS/2 mouse, it will be PSM_XXX_ID */ } mousehw_t; @@ -240,9 +239,9 @@ typedef struct mousevar { #define MOUSE_PS2_BUTTON2DOWN 0x04 /* middle */ #define MOUSE_PS2_BUTTON3DOWN 0x02 /* right */ #define MOUSE_PS2_TAP MOUSE_PS2_SYNC /* GlidePoint (PS/2) `tapping' - * Yes! this is the same bit + * Yes! this is the same bit * as SYNC! - */ + */ #define MOUSE_PS2_XNEG 0x10 #define MOUSE_PS2_YNEG 0x20 @@ -295,11 +294,11 @@ typedef struct mousevar { #define MOUSE_PS2VERSA_TAP 0x02 /* A4 Tech 4D Mouse (PS/2) data packet */ -#define MOUSE_4D_PACKETSIZE 3 +#define MOUSE_4D_PACKETSIZE 3 #define MOUSE_4D_WHEELBITS 0xf0 /* A4 Tech 4D+ Mouse (PS/2) data packet */ -#define MOUSE_4DPLUS_PACKETSIZE 3 +#define MOUSE_4DPLUS_PACKETSIZE 3 #define MOUSE_4DPLUS_ZNEG 0x04 /* sign bit */ #define MOUSE_4DPLUS_BUTTON4DOWN 0x08 @@ -311,7 +310,7 @@ typedef struct mousevar { * as at the level 0. There are additional three bytes which shows * `dz' and the states of additional buttons. `dz' is expressed as the * sum of the byte 5 and 6 which contain signed seven bit values. - * The states of the button 4 though 10 are in the bit 0 though 6 in + * The states of the button 4 though 10 are in the bit 0 though 6 in * the byte 7 respectively: 1 indicates the button is up. */ #define MOUSE_SYS_PACKETSIZE 8 diff --git a/usr.sbin/moused/moused.c b/usr.sbin/moused/moused.c index ce8f0c5181..4c3c5a1c0a 100644 --- a/usr.sbin/moused/moused.c +++ b/usr.sbin/moused/moused.c @@ -49,7 +49,7 @@ * $DragonFly: src/usr.sbin/moused/moused.c,v 1.7 2008/11/12 21:44:59 swildner Exp $ */ #include -#include +#include #include #include #include -- 2.41.0