[Midnightbsd-cvs] src [12372] trunk/sys/sys: Sync with FreeBSD 11-stable

[laffer1 at midnightbsd.org]

Revision: 12372
          http://svnweb.midnightbsd.org/src/?rev=12372
Author:   laffer1
Date:     2020-02-16 17:28:12 -0500 (Sun, 16 Feb 2020)
Log Message:
-----------
Sync with FreeBSD 11-stable

Modified Paths:
--------------
    trunk/sys/sys/mouse.h
    trunk/sys/sys/msg.h
    trunk/sys/sys/msgbuf.h

Modified: trunk/sys/sys/mouse.h
===================================================================
--- trunk/sys/sys/mouse.h	2020-02-16 22:18:24 UTC (rev 12371)
+++ trunk/sys/sys/mouse.h	2020-02-16 22:28:12 UTC (rev 12372)
@@ -21,7 +21,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: stable/10/sys/sys/mouse.h 281708 2015-04-18 21:24:46Z rpaulo $
+ * $FreeBSD: stable/11/sys/sys/mouse.h 344165 2019-02-15 20:46:03Z wulf $
  */
 
 #ifndef _SYS_MOUSE_H_
@@ -109,6 +109,9 @@
 	int capPalmDetect;
 	int capPassthrough;
 	int capMiddle;
+	int capLowPower;
+	int capMultiFingerReport;
+	int capBallistics;
 	int nExtendedButtons;
 	int nExtendedQueries;
 	int capClickPad;
@@ -126,6 +129,15 @@
 	int verticalScroll;
 	int horizontalScroll;
 	int verticalWheel;
+	int capEWmode;
+	int minimumXCoord;
+	int minimumYCoord;
+	int maximumXCoord;
+	int maximumYCoord;
+	int infoXupmm;
+	int infoYupmm;
+	int forcePad;
+	int topButtonPad;
 } synapticshw_t;
 
 /* iftype */
@@ -161,6 +173,7 @@
 #define MOUSE_MODEL_4DPLUS		12
 #define MOUSE_MODEL_SYNAPTICS		13
 #define	MOUSE_MODEL_TRACKPOINT		14
+#define	MOUSE_MODEL_ELANTECH		15
 
 typedef struct mousemode {
 	int protocol;		/* MOUSE_PROTO_XXX */
@@ -231,6 +244,9 @@
 /* Synaptics Touchpad */
 #define MOUSE_SYNAPTICS_PACKETSIZE	6	/* '3' works better */
 
+/* Elantech Touchpad */
+#define MOUSE_ELANTECH_PACKETSIZE	6
+
 /* Microsoft Serial mouse data packet */
 #define MOUSE_MSS_PACKETSIZE	3
 #define MOUSE_MSS_SYNCMASK	0x40

Modified: trunk/sys/sys/msg.h
===================================================================
--- trunk/sys/sys/msg.h	2020-02-16 22:18:24 UTC (rev 12371)
+++ trunk/sys/sys/msg.h	2020-02-16 22:28:12 UTC (rev 12372)
@@ -1,4 +1,5 @@
 /* $MidnightBSD$ */
+/* $FreeBSD: stable/11/sys/sys/msg.h 347995 2019-05-20 16:31:45Z kib $ */
 /*	$NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $	*/
 
 /*-
@@ -25,6 +26,9 @@
 
 #include <sys/cdefs.h>
 #include <sys/_types.h>
+#ifdef _WANT_SYSVMSG_INTERNALS
+#define	_WANT_SYSVIPC_INTERNALS
+#endif
 #include <sys/ipc.h>
 
 /*
@@ -116,7 +120,6 @@
 #endif
 
 #ifdef _KERNEL
-
 struct msg {
 	struct	msg *msg_next;  /* next msg in the chain */
 	long	msg_type; 	/* type of this message */
@@ -126,7 +129,9 @@
 	short	msg_spot;	/* location of start of msg in buffer */
 	struct	label *label;	/* MAC Framework label */
 };
+#endif
 
+#if defined(_KERNEL) || defined(_WANT_SYSVMSG_INTERNALS)
 /*
  * Based on the configuration parameters described in an SVR2 (yes, two)
  * config(1m) man page.
@@ -145,7 +150,6 @@
 		msgssz,		/* size of a message segment (see notes above) */
 		msgseg;		/* number of message segments */
 };
-extern struct msginfo	msginfo;
 
 /*
  * Kernel wrapper for the user-level structure.
@@ -162,9 +166,13 @@
 	struct	label *label;	/* MAC label */
 	struct	ucred *cred;	/* creator's credentials */
 };
+#endif
 
-#else /* !_KERNEL */
+#ifdef _KERNEL
+extern struct msginfo	msginfo;
 
+#else /* _KERNEL */
+
 __BEGIN_DECLS
 int msgctl(int, int, struct msqid_ds *);
 int msgget(key_t, int);
@@ -175,7 +183,6 @@
 int msgsys(int, ...);
 #endif
 __END_DECLS
+#endif /* !_KERNEL */
 
-#endif /* _KERNEL */
-
 #endif /* !_SYS_MSG_H_ */

Modified: trunk/sys/sys/msgbuf.h
===================================================================
--- trunk/sys/sys/msgbuf.h	2020-02-16 22:18:24 UTC (rev 12371)
+++ trunk/sys/sys/msgbuf.h	2020-02-16 22:28:12 UTC (rev 12372)
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)msgbuf.h	8.1 (Berkeley) 6/2/93
- * $FreeBSD: stable/10/sys/sys/msgbuf.h 233135 2012-03-19 00:36:32Z eadler $
+ * $FreeBSD: stable/11/sys/sys/msgbuf.h 338109 2018-08-20 17:27:30Z kevans $
  */
 
 #ifndef _SYS_MSGBUF_H_
@@ -67,7 +67,7 @@
 
 void	msgbufinit(void *ptr, int size);
 void	msgbuf_addchar(struct msgbuf *mbp, int c);
-void	msgbuf_addstr(struct msgbuf *mbp, int pri, char *str, int filter_cr);
+void	msgbuf_addstr(struct msgbuf *mbp, int pri, const char *str, int filter_cr);
 void	msgbuf_clear(struct msgbuf *mbp);
 void	msgbuf_copy(struct msgbuf *src, struct msgbuf *dst);
 int	msgbuf_getbytes(struct msgbuf *mbp, char *buf, int buflen);