From 877eacb630911f246ad27bc4164e8e60616ea08e Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Jan 2014 09:34:26 -0800
Subject: [PATCH 01/16] hammer2 - minor cleanups

* Minor cleanups
---
 sbin/hammer2/main.c               |  2 +-
 sys/vfs/hammer2/hammer2_chain.c   | 27 +++++++--------------------
 sys/vfs/hammer2/hammer2_disk.h    |  7 ++++---
 sys/vfs/hammer2/hammer2_freemap.c | 16 +++++++++-------
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/sbin/hammer2/main.c b/sbin/hammer2/main.c
index 77a5e99f2b..be1a62cb01 100644
--- a/sbin/hammer2/main.c
+++ b/sbin/hammer2/main.c
@@ -408,7 +408,7 @@ usage(int code)
 			"Create a PFS\n"
 		"    pfs-delete <label>           "
 			"Destroy a PFS\n"
-		"    snapshot                     "
+		"    snapshot [<label>]           "
 			"Snapshot a PFS\n"
 		"    service                      "
 			"Start service daemon\n"
diff --git a/sys/vfs/hammer2/hammer2_chain.c b/sys/vfs/hammer2/hammer2_chain.c
index 548676d1ba..ac0cc08e17 100644
--- a/sys/vfs/hammer2/hammer2_chain.c
+++ b/sys/vfs/hammer2/hammer2_chain.c
@@ -96,8 +96,6 @@ static hammer2_chain_t *hammer2_combined_find(
 static void hammer2_chain_assert_not_present(hammer2_chain_core_t *above,
 				 hammer2_chain_t *chain);
 
-hammer2_chain_t *XXChain;
-int XXChainWhy;
 /*
  * Basic RBTree for chains.  Chains cannot overlap within any given
  * core->rbtree without recursing through chain->rbtree.  We effectively
@@ -1969,8 +1967,6 @@ hammer2_chain_lookup(hammer2_chain_t **parentp, hammer2_key_t *key_nextp,
 	int generation;
 	int maxloops = 300000;
 	int wasdup;
-	hammer2_chain_t * volatile xxchain = NULL;
-	volatile int xxchainwhy;
 
 	if (flags & HAMMER2_LOOKUP_ALWAYS) {
 		how_maybe = how_always;
@@ -2125,8 +2121,6 @@ again:
 			goto again;
 		}
 		if (bcmp(&bcopy, bref, sizeof(bcopy))) {
-			xxchain = chain;
-			xxchainwhy = 1;
 			hammer2_chain_drop(chain);
 			goto again;
 		}
@@ -2168,8 +2162,6 @@ again:
 			if (key_beg == 0 || key_beg > key_end)
 				return(NULL);
 		}
-		xxchain = chain;
-			xxchainwhy = 2;
 		goto again;
 	}
 
@@ -2193,16 +2185,12 @@ again:
 	    chain->bref.type == HAMMER2_BREF_TYPE_FREEMAP_NODE) {
 		hammer2_chain_unlock(parent);
 		*parentp = parent = chain;
-		xxchain = chain;
-			xxchainwhy = 3;
 		goto again;
 	}
 done:
 	/*
 	 * All done, return the chain
 	 */
-	XXChain = chain;
-	XXChainWhy = xxchainwhy;
 	return (chain);
 }
 
@@ -2284,12 +2272,14 @@ hammer2_chain_next(hammer2_chain_t **parentp, hammer2_chain_t *chain,
 }
 
 /*
- * Raw scan functions are similar to lookup/next but do not seek the parent
- * chain and do not skip stale chains.  These functions are primarily used
- * by the recovery code.
+ * The raw scan function is similar to lookup/next but does not seek to a key.
+ * Blockrefs are iterated via first_chain = (parent, NULL) and
+ * next_chain = (parent, chain).
  *
- * Parent and chain are locked, parent's data must be resolved.  To acquire
- * the first sub-chain under parent pass chain == NULL.
+ * The passed-in parent must be locked and its data resolved.  The returned
+ * chain will be locked.  Pass chain == NULL to acquire the first sub-chain
+ * under parent and then iterate with the passed-in chain (which this
+ * function will unlock).
  */
 hammer2_chain_t *
 hammer2_chain_scan(hammer2_chain_t *parent, hammer2_chain_t *chain,
@@ -3311,7 +3301,6 @@ hammer2_chain_create_indirect(hammer2_trans_t *trans, hammer2_chain_t *parent,
 	int maxloops = 300000;
 	int retry_same;
 	int wasdup;
-	hammer2_chain_t * volatile xxchain = NULL;
 
 	/*
 	 * Calculate the base blockref pointer or NULL if the chain
@@ -3555,7 +3544,6 @@ hammer2_chain_create_indirect(hammer2_trans_t *trans, hammer2_chain_t *parent,
 			if ((chain->flags & HAMMER2_CHAIN_DUPLICATED) &&
 			    wasdup == 0) {
 				retry_same = 1;
-				xxchain = chain;
 			}
 			goto next_key;
 		}
@@ -3643,7 +3631,6 @@ next_key_spinlocked:
 		 */
 		parent = ichain;
 	}
-	XXChain = xxchain;
 
 	return(parent);
 }
diff --git a/sys/vfs/hammer2/hammer2_disk.h b/sys/vfs/hammer2/hammer2_disk.h
index 4153148559..ec62c81773 100644
--- a/sys/vfs/hammer2/hammer2_disk.h
+++ b/sys/vfs/hammer2/hammer2_disk.h
@@ -200,7 +200,7 @@
  * 2MB of storage (x1024 elements = 2GB).  2 bits per chunk:
  *
  *	00	Free
- *	01	Possibly fragmented
+ *	01	(reserved)
  *	10	Possibly free
  *	11	Allocated
  *
@@ -611,7 +611,7 @@ typedef struct hammer2_blockset hammer2_blockset_t;
  *	     storage.  Bit patterns are as follows:
  *
  *	     00	Unallocated
- *	     01 Armed for bulk free scan
+ *	     01 (reserved)
  *	     10 Possibly free
  *           11 Allocated
  */
@@ -923,7 +923,8 @@ struct hammer2_volume_data {
 	hammer2_tid_t	alloc_tid;		/* 0080 Alloctable modify tid */
 	hammer2_tid_t	inode_tid;		/* 0088 Inode allocator tid */
 	hammer2_tid_t	freemap_tid;		/* 0090 committed tid (fmap) */
-	hammer2_tid_t	reserved0090[6];	/* 0098-00C7 */
+	hammer2_tid_t	bulkfree_tid;		/* 0098 bulkfree incremental */
+	hammer2_tid_t	reserved00A0[5];	/* 00A0-00C7 */
 
 	/*
 	 * Copyids are allocated dynamically from the copyexists bitmap.
diff --git a/sys/vfs/hammer2/hammer2_freemap.c b/sys/vfs/hammer2/hammer2_freemap.c
index 8d8876ca92..d10bf9ef99 100644
--- a/sys/vfs/hammer2/hammer2_freemap.c
+++ b/sys/vfs/hammer2/hammer2_freemap.c
@@ -256,7 +256,11 @@ hammer2_freemap_alloc(hammer2_trans_t *trans, hammer2_chain_t *chain,
 		return (hammer2_freemap_reserve(trans, chain, radix));
 	}
 
+#if 0
 	/*
+	 * (this mechanic is no longer used, DOMAYFREE is used only by
+	 * the bulk freemap scan now).
+	 *
 	 * Mark previously allocated block as possibly freeable.  There might
 	 * be snapshots and other races so we can't just mark it fully free.
 	 * (XXX optimize this for the current-transaction create+delete case)
@@ -265,6 +269,7 @@ hammer2_freemap_alloc(hammer2_trans_t *trans, hammer2_chain_t *chain,
 		hammer2_freemap_adjust(trans, hmp, bref,
 				       HAMMER2_FREEMAP_DOMAYFREE);
 	}
+#endif
 
 	/*
 	 * Setting ISALLOCATING ensures correct operation even when the
@@ -771,13 +776,10 @@ hammer2_freemap_iterate(hammer2_trans_t *trans, hammer2_chain_t **parentp,
 }
 
 /*
- * Free the specified blockref.  This code is only able to fully free
- * blocks when (how) is non-zero, otherwise the block is marked for
- * the bulk freeing pass to check.
- *
- * Normal use is to only mark inodes as possibly being free.  The underlying
- * file blocks are not necessarily marked.  The bulk freescan can
- * theoretically handle the case.
+ * Adjust the bit-pattern for data in the freemap bitmap according to
+ * (how).  This code is called from on-mount recovery to fixup (mark
+ * as allocated) blocks whos freemap upates might not have been committed
+ * in the last crash and is used by the bulk freemap scan to stage frees.
  *
  * XXX currently disabled when how == 0 (the normal real-time case).  At
  * the moment we depend on the bulk freescan to actually free blocks.  It
-- 
2.41.0


From 6f5a0e73c5b414d7e9999244f369631be7b2d879 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Jan 2014 09:35:24 -0800
Subject: [PATCH 02/16] kernel - Add another prototype skeleton to subr_input.c

* Add inputev_ioctl() (inactive file)

* Minor linux-compat adjustments (inactive file)
---
 sys/kern/subr_input.c | 9 +++++++++
 sys/sys/input.h       | 1 +
 sys/sys/linux_types.h | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/sys/kern/subr_input.c b/sys/kern/subr_input.c
index d6be65be2f..f59f9f7a8d 100644
--- a/sys/kern/subr_input.c
+++ b/sys/kern/subr_input.c
@@ -133,6 +133,15 @@ inputev_report_abs(inputev_t *iev, u_int code, int val)
 }
 /* EV_ABS */
 
+/*
+ * Handle ioctls
+ */
+int
+inputev_ioctl(inputev_t *iev, u_long cmd, void *data)
+{
+	return ENOTTY;
+}
+
 /*
  * Supply a data stream to requestors
  */
diff --git a/sys/sys/input.h b/sys/sys/input.h
index 7e0068b7e0..45e3cc85b6 100644
--- a/sys/sys/input.h
+++ b/sys/sys/input.h
@@ -54,6 +54,7 @@ void inputev_register(inputev_t *iev);
 void inputev_deregister(inputev_t *iev);
 void inputev_sync(inputev_t *iev);
 int inputev_read(inputev_t *iev, struct uio *uio, int ioflag);
+int inputev_ioctl(inputev_t *iev, u_long cmd, void *data);
 void inputev_mt_sync_frame(inputev_t *iev);
 
 void inputev_set_evbit(inputev_t *iev, int bit);
diff --git a/sys/sys/linux_types.h b/sys/sys/linux_types.h
index abe4dd0504..ca28811263 100644
--- a/sys/sys/linux_types.h
+++ b/sys/sys/linux_types.h
@@ -47,4 +47,7 @@
 #define __s8    int8_t
 #define __user
 
+#define _IOC_READ	IOC_IN
+#define _IOC_WRITE	IOC_OUT
+
 #endif
-- 
2.41.0


From 62d43307641b61268877ff96156d77edf40c3321 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Jan 2014 09:37:07 -0800
Subject: [PATCH 03/16] build - remove uapi/linux.h for now

* Remove the file from sys/contrib until we can figure out licensing
  issues.
---
 sys/contrib/linux/include/uapi/linux/input.h | 1170 ------------------
 1 file changed, 1170 deletions(-)
 delete mode 100644 sys/contrib/linux/include/uapi/linux/input.h

diff --git a/sys/contrib/linux/include/uapi/linux/input.h b/sys/contrib/linux/include/uapi/linux/input.h
deleted file mode 100644
index 8ecbafbd8a..0000000000
--- a/sys/contrib/linux/include/uapi/linux/input.h
+++ /dev/null
@@ -1,1170 +0,0 @@
-/*
- * Copyright (c) 1999-2002 Vojtech Pavlik
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- */
-#ifndef _UAPI_INPUT_H
-#define _UAPI_INPUT_H
-
-/*
- * For DragonFly - do not include directly, include sys/input.h instead
- */
-/* DragonFly - removed #include's */
-
-/*
- * The event structure itself
- */
-
-struct input_event {
-	struct timeval time;
-	__u16 type;
-	__u16 code;
-	__s32 value;
-};
-
-/*
- * Protocol version.
- */
-
-#define EV_VERSION		0x010001
-
-/*
- * IOCTLs (0x00 - 0x7f)
- */
-
-struct input_id {
-	__u16 bustype;
-	__u16 vendor;
-	__u16 product;
-	__u16 version;
-};
-
-/**
- * struct input_absinfo - used by EVIOCGABS/EVIOCSABS ioctls
- * @value: latest reported value for the axis.
- * @minimum: specifies minimum value for the axis.
- * @maximum: specifies maximum value for the axis.
- * @fuzz: specifies fuzz value that is used to filter noise from
- *	the event stream.
- * @flat: values that are within this value will be discarded by
- *	joydev interface and reported as 0 instead.
- * @resolution: specifies resolution for the values reported for
- *	the axis.
- *
- * Note that input core does not clamp reported values to the
- * [minimum, maximum] limits, such task is left to userspace.
- *
- * Resolution for main axes (ABS_X, ABS_Y, ABS_Z) is reported in
- * units per millimeter (units/mm), resolution for rotational axes
- * (ABS_RX, ABS_RY, ABS_RZ) is reported in units per radian.
- */
-struct input_absinfo {
-	__s32 value;
-	__s32 minimum;
-	__s32 maximum;
-	__s32 fuzz;
-	__s32 flat;
-	__s32 resolution;
-};
-
-/**
- * struct input_keymap_entry - used by EVIOCGKEYCODE/EVIOCSKEYCODE ioctls
- * @scancode: scancode represented in machine-endian form.
- * @len: length of the scancode that resides in @scancode buffer.
- * @index: index in the keymap, may be used instead of scancode
- * @flags: allows to specify how kernel should handle the request. For
- *	example, setting INPUT_KEYMAP_BY_INDEX flag indicates that kernel
- *	should perform lookup in keymap by @index instead of @scancode
- * @keycode: key code assigned to this scancode
- *
- * The structure is used to retrieve and modify keymap data. Users have
- * option of performing lookup either by @scancode itself or by @index
- * in keymap entry. EVIOCGKEYCODE will also return scancode or index
- * (depending on which element was used to perform lookup).
- */
-struct input_keymap_entry {
-#define INPUT_KEYMAP_BY_INDEX	(1 << 0)
-	__u8  flags;
-	__u8  len;
-	__u16 index;
-	__u32 keycode;
-	__u8  scancode[32];
-};
-
-#define EVIOCGVERSION		_IOR('E', 0x01, int)			/* get driver version */
-#define EVIOCGID		_IOR('E', 0x02, struct input_id)	/* get device ID */
-#define EVIOCGREP		_IOR('E', 0x03, unsigned int[2])	/* get repeat settings */
-#define EVIOCSREP		_IOW('E', 0x03, unsigned int[2])	/* set repeat settings */
-
-#define EVIOCGKEYCODE		_IOR('E', 0x04, unsigned int[2])        /* get keycode */
-#define EVIOCGKEYCODE_V2	_IOR('E', 0x04, struct input_keymap_entry)
-#define EVIOCSKEYCODE		_IOW('E', 0x04, unsigned int[2])        /* set keycode */
-#define EVIOCSKEYCODE_V2	_IOW('E', 0x04, struct input_keymap_entry)
-
-#define EVIOCGNAME(len)		_IOC(_IOC_READ, 'E', 0x06, len)		/* get device name */
-#define EVIOCGPHYS(len)		_IOC(_IOC_READ, 'E', 0x07, len)		/* get physical location */
-#define EVIOCGUNIQ(len)		_IOC(_IOC_READ, 'E', 0x08, len)		/* get unique identifier */
-#define EVIOCGPROP(len)		_IOC(_IOC_READ, 'E', 0x09, len)		/* get device properties */
-
-/**
- * EVIOCGMTSLOTS(len) - get MT slot values
- * @len: size of the data buffer in bytes
- *
- * The ioctl buffer argument should be binary equivalent to
- *
- * struct input_mt_request_layout {
- *	__u32 code;
- *	__s32 values[num_slots];
- * };
- *
- * where num_slots is the (arbitrary) number of MT slots to extract.
- *
- * The ioctl size argument (len) is the size of the buffer, which
- * should satisfy len = (num_slots + 1) * sizeof(__s32).  If len is
- * too small to fit all available slots, the first num_slots are
- * returned.
- *
- * Before the call, code is set to the wanted ABS_MT event type. On
- * return, values[] is filled with the slot values for the specified
- * ABS_MT code.
- *
- * If the request code is not an ABS_MT value, -EINVAL is returned.
- */
-#define EVIOCGMTSLOTS(len)	_IOC(_IOC_READ, 'E', 0x0a, len)
-
-#define EVIOCGKEY(len)		_IOC(_IOC_READ, 'E', 0x18, len)		/* get global key state */
-#define EVIOCGLED(len)		_IOC(_IOC_READ, 'E', 0x19, len)		/* get all LEDs */
-#define EVIOCGSND(len)		_IOC(_IOC_READ, 'E', 0x1a, len)		/* get all sounds status */
-#define EVIOCGSW(len)		_IOC(_IOC_READ, 'E', 0x1b, len)		/* get all switch states */
-
-#define EVIOCGBIT(ev,len)	_IOC(_IOC_READ, 'E', 0x20 + (ev), len)	/* get event bits */
-#define EVIOCGABS(abs)		_IOR('E', 0x40 + (abs), struct input_absinfo)	/* get abs value/limits */
-#define EVIOCSABS(abs)		_IOW('E', 0xc0 + (abs), struct input_absinfo)	/* set abs value/limits */
-
-#define EVIOCSFF		_IOC(_IOC_WRITE, 'E', 0x80, sizeof(struct ff_effect))	/* send a force effect to a force feedback device */
-#define EVIOCRMFF		_IOW('E', 0x81, int)			/* Erase a force effect */
-#define EVIOCGEFFECTS		_IOR('E', 0x84, int)			/* Report number of effects playable at the same time */
-
-#define EVIOCGRAB		_IOW('E', 0x90, int)			/* Grab/Release device */
-#define EVIOCREVOKE		_IOW('E', 0x91, int)			/* Revoke device access */
-
-#define EVIOCSCLOCKID		_IOW('E', 0xa0, int)			/* Set clockid to be used for timestamps */
-
-/*
- * Device properties and quirks
- */
-
-#define INPUT_PROP_POINTER		0x00	/* needs a pointer */
-#define INPUT_PROP_DIRECT		0x01	/* direct input devices */
-#define INPUT_PROP_BUTTONPAD		0x02	/* has button(s) under pad */
-#define INPUT_PROP_SEMI_MT		0x03	/* touch rectangle only */
-
-#define INPUT_PROP_MAX			0x1f
-#define INPUT_PROP_CNT			(INPUT_PROP_MAX + 1)
-
-/*
- * Event types
- */
-
-#define EV_SYN			0x00
-#define EV_KEY			0x01
-#define EV_REL			0x02
-#define EV_ABS			0x03
-#define EV_MSC			0x04
-#define EV_SW			0x05
-#define EV_LED			0x11
-#define EV_SND			0x12
-#define EV_REP			0x14
-#define EV_FF			0x15
-#define EV_PWR			0x16
-#define EV_FF_STATUS		0x17
-#define EV_MAX			0x1f
-#define EV_CNT			(EV_MAX+1)
-
-/*
- * Synchronization events.
- */
-
-#define SYN_REPORT		0
-#define SYN_CONFIG		1
-#define SYN_MT_REPORT		2
-#define SYN_DROPPED		3
-#define SYN_MAX			0xf
-#define SYN_CNT			(SYN_MAX+1)
-
-/*
- * Keys and buttons
- *
- * Most of the keys/buttons are modeled after USB HUT 1.12
- * (see http://www.usb.org/developers/hidpage).
- * Abbreviations in the comments:
- * AC - Application Control
- * AL - Application Launch Button
- * SC - System Control
- */
-
-#define KEY_RESERVED		0
-#define KEY_ESC			1
-#define KEY_1			2
-#define KEY_2			3
-#define KEY_3			4
-#define KEY_4			5
-#define KEY_5			6
-#define KEY_6			7
-#define KEY_7			8
-#define KEY_8			9
-#define KEY_9			10
-#define KEY_0			11
-#define KEY_MINUS		12
-#define KEY_EQUAL		13
-#define KEY_BACKSPACE		14
-#define KEY_TAB			15
-#define KEY_Q			16
-#define KEY_W			17
-#define KEY_E			18
-#define KEY_R			19
-#define KEY_T			20
-#define KEY_Y			21
-#define KEY_U			22
-#define KEY_I			23
-#define KEY_O			24
-#define KEY_P			25
-#define KEY_LEFTBRACE		26
-#define KEY_RIGHTBRACE		27
-#define KEY_ENTER		28
-#define KEY_LEFTCTRL		29
-#define KEY_A			30
-#define KEY_S			31
-#define KEY_D			32
-#define KEY_F			33
-#define KEY_G			34
-#define KEY_H			35
-#define KEY_J			36
-#define KEY_K			37
-#define KEY_L			38
-#define KEY_SEMICOLON		39
-#define KEY_APOSTROPHE		40
-#define KEY_GRAVE		41
-#define KEY_LEFTSHIFT		42
-#define KEY_BACKSLASH		43
-#define KEY_Z			44
-#define KEY_X			45
-#define KEY_C			46
-#define KEY_V			47
-#define KEY_B			48
-#define KEY_N			49
-#define KEY_M			50
-#define KEY_COMMA		51
-#define KEY_DOT			52
-#define KEY_SLASH		53
-#define KEY_RIGHTSHIFT		54
-#define KEY_KPASTERISK		55
-#define KEY_LEFTALT		56
-#define KEY_SPACE		57
-#define KEY_CAPSLOCK		58
-#define KEY_F1			59
-#define KEY_F2			60
-#define KEY_F3			61
-#define KEY_F4			62
-#define KEY_F5			63
-#define KEY_F6			64
-#define KEY_F7			65
-#define KEY_F8			66
-#define KEY_F9			67
-#define KEY_F10			68
-#define KEY_NUMLOCK		69
-#define KEY_SCROLLLOCK		70
-#define KEY_KP7			71
-#define KEY_KP8			72
-#define KEY_KP9			73
-#define KEY_KPMINUS		74
-#define KEY_KP4			75
-#define KEY_KP5			76
-#define KEY_KP6			77
-#define KEY_KPPLUS		78
-#define KEY_KP1			79
-#define KEY_KP2			80
-#define KEY_KP3			81
-#define KEY_KP0			82
-#define KEY_KPDOT		83
-
-#define KEY_ZENKAKUHANKAKU	85
-#define KEY_102ND		86
-#define KEY_F11			87
-#define KEY_F12			88
-#define KEY_RO			89
-#define KEY_KATAKANA		90
-#define KEY_HIRAGANA		91
-#define KEY_HENKAN		92
-#define KEY_KATAKANAHIRAGANA	93
-#define KEY_MUHENKAN		94
-#define KEY_KPJPCOMMA		95
-#define KEY_KPENTER		96
-#define KEY_RIGHTCTRL		97
-#define KEY_KPSLASH		98
-#define KEY_SYSRQ		99
-#define KEY_RIGHTALT		100
-#define KEY_LINEFEED		101
-#define KEY_HOME		102
-#define KEY_UP			103
-#define KEY_PAGEUP		104
-#define KEY_LEFT		105
-#define KEY_RIGHT		106
-#define KEY_END			107
-#define KEY_DOWN		108
-#define KEY_PAGEDOWN		109
-#define KEY_INSERT		110
-#define KEY_DELETE		111
-#define KEY_MACRO		112
-#define KEY_MUTE		113
-#define KEY_VOLUMEDOWN		114
-#define KEY_VOLUMEUP		115
-#define KEY_POWER		116	/* SC System Power Down */
-#define KEY_KPEQUAL		117
-#define KEY_KPPLUSMINUS		118
-#define KEY_PAUSE		119
-#define KEY_SCALE		120	/* AL Compiz Scale (Expose) */
-
-#define KEY_KPCOMMA		121
-#define KEY_HANGEUL		122
-#define KEY_HANGUEL		KEY_HANGEUL
-#define KEY_HANJA		123
-#define KEY_YEN			124
-#define KEY_LEFTMETA		125
-#define KEY_RIGHTMETA		126
-#define KEY_COMPOSE		127
-
-#define KEY_STOP		128	/* AC Stop */
-#define KEY_AGAIN		129
-#define KEY_PROPS		130	/* AC Properties */
-#define KEY_UNDO		131	/* AC Undo */
-#define KEY_FRONT		132
-#define KEY_COPY		133	/* AC Copy */
-#define KEY_OPEN		134	/* AC Open */
-#define KEY_PASTE		135	/* AC Paste */
-#define KEY_FIND		136	/* AC Search */
-#define KEY_CUT			137	/* AC Cut */
-#define KEY_HELP		138	/* AL Integrated Help Center */
-#define KEY_MENU		139	/* Menu (show menu) */
-#define KEY_CALC		140	/* AL Calculator */
-#define KEY_SETUP		141
-#define KEY_SLEEP		142	/* SC System Sleep */
-#define KEY_WAKEUP		143	/* System Wake Up */
-#define KEY_FILE		144	/* AL Local Machine Browser */
-#define KEY_SENDFILE		145
-#define KEY_DELETEFILE		146
-#define KEY_XFER		147
-#define KEY_PROG1		148
-#define KEY_PROG2		149
-#define KEY_WWW			150	/* AL Internet Browser */
-#define KEY_MSDOS		151
-#define KEY_COFFEE		152	/* AL Terminal Lock/Screensaver */
-#define KEY_SCREENLOCK		KEY_COFFEE
-#define KEY_DIRECTION		153
-#define KEY_CYCLEWINDOWS	154
-#define KEY_MAIL		155
-#define KEY_BOOKMARKS		156	/* AC Bookmarks */
-#define KEY_COMPUTER		157
-#define KEY_BACK		158	/* AC Back */
-#define KEY_FORWARD		159	/* AC Forward */
-#define KEY_CLOSECD		160
-#define KEY_EJECTCD		161
-#define KEY_EJECTCLOSECD	162
-#define KEY_NEXTSONG		163
-#define KEY_PLAYPAUSE		164
-#define KEY_PREVIOUSSONG	165
-#define KEY_STOPCD		166
-#define KEY_RECORD		167
-#define KEY_REWIND		168
-#define KEY_PHONE		169	/* Media Select Telephone */
-#define KEY_ISO			170
-#define KEY_CONFIG		171	/* AL Consumer Control Configuration */
-#define KEY_HOMEPAGE		172	/* AC Home */
-#define KEY_REFRESH		173	/* AC Refresh */
-#define KEY_EXIT		174	/* AC Exit */
-#define KEY_MOVE		175
-#define KEY_EDIT		176
-#define KEY_SCROLLUP		177
-#define KEY_SCROLLDOWN		178
-#define KEY_KPLEFTPAREN		179
-#define KEY_KPRIGHTPAREN	180
-#define KEY_NEW			181	/* AC New */
-#define KEY_REDO		182	/* AC Redo/Repeat */
-
-#define KEY_F13			183
-#define KEY_F14			184
-#define KEY_F15			185
-#define KEY_F16			186
-#define KEY_F17			187
-#define KEY_F18			188
-#define KEY_F19			189
-#define KEY_F20			190
-#define KEY_F21			191
-#define KEY_F22			192
-#define KEY_F23			193
-#define KEY_F24			194
-
-#define KEY_PLAYCD		200
-#define KEY_PAUSECD		201
-#define KEY_PROG3		202
-#define KEY_PROG4		203
-#define KEY_DASHBOARD		204	/* AL Dashboard */
-#define KEY_SUSPEND		205
-#define KEY_CLOSE		206	/* AC Close */
-#define KEY_PLAY		207
-#define KEY_FASTFORWARD		208
-#define KEY_BASSBOOST		209
-#define KEY_PRINT		210	/* AC Print */
-#define KEY_HP			211
-#define KEY_CAMERA		212
-#define KEY_SOUND		213
-#define KEY_QUESTION		214
-#define KEY_EMAIL		215
-#define KEY_CHAT		216
-#define KEY_SEARCH		217
-#define KEY_CONNECT		218
-#define KEY_FINANCE		219	/* AL Checkbook/Finance */
-#define KEY_SPORT		220
-#define KEY_SHOP		221
-#define KEY_ALTERASE		222
-#define KEY_CANCEL		223	/* AC Cancel */
-#define KEY_BRIGHTNESSDOWN	224
-#define KEY_BRIGHTNESSUP	225
-#define KEY_MEDIA		226
-
-#define KEY_SWITCHVIDEOMODE	227	/* Cycle between available video
-					   outputs (Monitor/LCD/TV-out/etc) */
-#define KEY_KBDILLUMTOGGLE	228
-#define KEY_KBDILLUMDOWN	229
-#define KEY_KBDILLUMUP		230
-
-#define KEY_SEND		231	/* AC Send */
-#define KEY_REPLY		232	/* AC Reply */
-#define KEY_FORWARDMAIL		233	/* AC Forward Msg */
-#define KEY_SAVE		234	/* AC Save */
-#define KEY_DOCUMENTS		235
-
-#define KEY_BATTERY		236
-
-#define KEY_BLUETOOTH		237
-#define KEY_WLAN		238
-#define KEY_UWB			239
-
-#define KEY_UNKNOWN		240
-
-#define KEY_VIDEO_NEXT		241	/* drive next video source */
-#define KEY_VIDEO_PREV		242	/* drive previous video source */
-#define KEY_BRIGHTNESS_CYCLE	243	/* brightness up, after max is min */
-#define KEY_BRIGHTNESS_ZERO	244	/* brightness off, use ambient */
-#define KEY_DISPLAY_OFF		245	/* display device to off state */
-
-#define KEY_WIMAX		246
-#define KEY_RFKILL		247	/* Key that controls all radios */
-
-#define KEY_MICMUTE		248	/* Mute / unmute the microphone */
-
-/* Code 255 is reserved for special needs of AT keyboard driver */
-
-#define BTN_MISC		0x100
-#define BTN_0			0x100
-#define BTN_1			0x101
-#define BTN_2			0x102
-#define BTN_3			0x103
-#define BTN_4			0x104
-#define BTN_5			0x105
-#define BTN_6			0x106
-#define BTN_7			0x107
-#define BTN_8			0x108
-#define BTN_9			0x109
-
-#define BTN_MOUSE		0x110
-#define BTN_LEFT		0x110
-#define BTN_RIGHT		0x111
-#define BTN_MIDDLE		0x112
-#define BTN_SIDE		0x113
-#define BTN_EXTRA		0x114
-#define BTN_FORWARD		0x115
-#define BTN_BACK		0x116
-#define BTN_TASK		0x117
-
-#define BTN_JOYSTICK		0x120
-#define BTN_TRIGGER		0x120
-#define BTN_THUMB		0x121
-#define BTN_THUMB2		0x122
-#define BTN_TOP			0x123
-#define BTN_TOP2		0x124
-#define BTN_PINKIE		0x125
-#define BTN_BASE		0x126
-#define BTN_BASE2		0x127
-#define BTN_BASE3		0x128
-#define BTN_BASE4		0x129
-#define BTN_BASE5		0x12a
-#define BTN_BASE6		0x12b
-#define BTN_DEAD		0x12f
-
-#define BTN_GAMEPAD		0x130
-#define BTN_SOUTH		0x130
-#define BTN_A			BTN_SOUTH
-#define BTN_EAST		0x131
-#define BTN_B			BTN_EAST
-#define BTN_C			0x132
-#define BTN_NORTH		0x133
-#define BTN_X			BTN_NORTH
-#define BTN_WEST		0x134
-#define BTN_Y			BTN_WEST
-#define BTN_Z			0x135
-#define BTN_TL			0x136
-#define BTN_TR			0x137
-#define BTN_TL2			0x138
-#define BTN_TR2			0x139
-#define BTN_SELECT		0x13a
-#define BTN_START		0x13b
-#define BTN_MODE		0x13c
-#define BTN_THUMBL		0x13d
-#define BTN_THUMBR		0x13e
-
-#define BTN_DIGI		0x140
-#define BTN_TOOL_PEN		0x140
-#define BTN_TOOL_RUBBER		0x141
-#define BTN_TOOL_BRUSH		0x142
-#define BTN_TOOL_PENCIL		0x143
-#define BTN_TOOL_AIRBRUSH	0x144
-#define BTN_TOOL_FINGER		0x145
-#define BTN_TOOL_MOUSE		0x146
-#define BTN_TOOL_LENS		0x147
-#define BTN_TOOL_QUINTTAP	0x148	/* Five fingers on trackpad */
-#define BTN_TOUCH		0x14a
-#define BTN_STYLUS		0x14b
-#define BTN_STYLUS2		0x14c
-#define BTN_TOOL_DOUBLETAP	0x14d
-#define BTN_TOOL_TRIPLETAP	0x14e
-#define BTN_TOOL_QUADTAP	0x14f	/* Four fingers on trackpad */
-
-#define BTN_WHEEL		0x150
-#define BTN_GEAR_DOWN		0x150
-#define BTN_GEAR_UP		0x151
-
-#define KEY_OK			0x160
-#define KEY_SELECT		0x161
-#define KEY_GOTO		0x162
-#define KEY_CLEAR		0x163
-#define KEY_POWER2		0x164
-#define KEY_OPTION		0x165
-#define KEY_INFO		0x166	/* AL OEM Features/Tips/Tutorial */
-#define KEY_TIME		0x167
-#define KEY_VENDOR		0x168
-#define KEY_ARCHIVE		0x169
-#define KEY_PROGRAM		0x16a	/* Media Select Program Guide */
-#define KEY_CHANNEL		0x16b
-#define KEY_FAVORITES		0x16c
-#define KEY_EPG			0x16d
-#define KEY_PVR			0x16e	/* Media Select Home */
-#define KEY_MHP			0x16f
-#define KEY_LANGUAGE		0x170
-#define KEY_TITLE		0x171
-#define KEY_SUBTITLE		0x172
-#define KEY_ANGLE		0x173
-#define KEY_ZOOM		0x174
-#define KEY_MODE		0x175
-#define KEY_KEYBOARD		0x176
-#define KEY_SCREEN		0x177
-#define KEY_PC			0x178	/* Media Select Computer */
-#define KEY_TV			0x179	/* Media Select TV */
-#define KEY_TV2			0x17a	/* Media Select Cable */
-#define KEY_VCR			0x17b	/* Media Select VCR */
-#define KEY_VCR2		0x17c	/* VCR Plus */
-#define KEY_SAT			0x17d	/* Media Select Satellite */
-#define KEY_SAT2		0x17e
-#define KEY_CD			0x17f	/* Media Select CD */
-#define KEY_TAPE		0x180	/* Media Select Tape */
-#define KEY_RADIO		0x181
-#define KEY_TUNER		0x182	/* Media Select Tuner */
-#define KEY_PLAYER		0x183
-#define KEY_TEXT		0x184
-#define KEY_DVD			0x185	/* Media Select DVD */
-#define KEY_AUX			0x186
-#define KEY_MP3			0x187
-#define KEY_AUDIO		0x188	/* AL Audio Browser */
-#define KEY_VIDEO		0x189	/* AL Movie Browser */
-#define KEY_DIRECTORY		0x18a
-#define KEY_LIST		0x18b
-#define KEY_MEMO		0x18c	/* Media Select Messages */
-#define KEY_CALENDAR		0x18d
-#define KEY_RED			0x18e
-#define KEY_GREEN		0x18f
-#define KEY_YELLOW		0x190
-#define KEY_BLUE		0x191
-#define KEY_CHANNELUP		0x192	/* Channel Increment */
-#define KEY_CHANNELDOWN		0x193	/* Channel Decrement */
-#define KEY_FIRST		0x194
-#define KEY_LAST		0x195	/* Recall Last */
-#define KEY_AB			0x196
-#define KEY_NEXT		0x197
-#define KEY_RESTART		0x198
-#define KEY_SLOW		0x199
-#define KEY_SHUFFLE		0x19a
-#define KEY_BREAK		0x19b
-#define KEY_PREVIOUS		0x19c
-#define KEY_DIGITS		0x19d
-#define KEY_TEEN		0x19e
-#define KEY_TWEN		0x19f
-#define KEY_VIDEOPHONE		0x1a0	/* Media Select Video Phone */
-#define KEY_GAMES		0x1a1	/* Media Select Games */
-#define KEY_ZOOMIN		0x1a2	/* AC Zoom In */
-#define KEY_ZOOMOUT		0x1a3	/* AC Zoom Out */
-#define KEY_ZOOMRESET		0x1a4	/* AC Zoom */
-#define KEY_WORDPROCESSOR	0x1a5	/* AL Word Processor */
-#define KEY_EDITOR		0x1a6	/* AL Text Editor */
-#define KEY_SPREADSHEET		0x1a7	/* AL Spreadsheet */
-#define KEY_GRAPHICSEDITOR	0x1a8	/* AL Graphics Editor */
-#define KEY_PRESENTATION	0x1a9	/* AL Presentation App */
-#define KEY_DATABASE		0x1aa	/* AL Database App */
-#define KEY_NEWS		0x1ab	/* AL Newsreader */
-#define KEY_VOICEMAIL		0x1ac	/* AL Voicemail */
-#define KEY_ADDRESSBOOK		0x1ad	/* AL Contacts/Address Book */
-#define KEY_MESSENGER		0x1ae	/* AL Instant Messaging */
-#define KEY_DISPLAYTOGGLE	0x1af	/* Turn display (LCD) on and off */
-#define KEY_SPELLCHECK		0x1b0   /* AL Spell Check */
-#define KEY_LOGOFF		0x1b1   /* AL Logoff */
-
-#define KEY_DOLLAR		0x1b2
-#define KEY_EURO		0x1b3
-
-#define KEY_FRAMEBACK		0x1b4	/* Consumer - transport controls */
-#define KEY_FRAMEFORWARD	0x1b5
-#define KEY_CONTEXT_MENU	0x1b6	/* GenDesc - system context menu */
-#define KEY_MEDIA_REPEAT	0x1b7	/* Consumer - transport control */
-#define KEY_10CHANNELSUP	0x1b8	/* 10 channels up (10+) */
-#define KEY_10CHANNELSDOWN	0x1b9	/* 10 channels down (10-) */
-#define KEY_IMAGES		0x1ba	/* AL Image Browser */
-
-#define KEY_DEL_EOL		0x1c0
-#define KEY_DEL_EOS		0x1c1
-#define KEY_INS_LINE		0x1c2
-#define KEY_DEL_LINE		0x1c3
-
-#define KEY_FN			0x1d0
-#define KEY_FN_ESC		0x1d1
-#define KEY_FN_F1		0x1d2
-#define KEY_FN_F2		0x1d3
-#define KEY_FN_F3		0x1d4
-#define KEY_FN_F4		0x1d5
-#define KEY_FN_F5		0x1d6
-#define KEY_FN_F6		0x1d7
-#define KEY_FN_F7		0x1d8
-#define KEY_FN_F8		0x1d9
-#define KEY_FN_F9		0x1da
-#define KEY_FN_F10		0x1db
-#define KEY_FN_F11		0x1dc
-#define KEY_FN_F12		0x1dd
-#define KEY_FN_1		0x1de
-#define KEY_FN_2		0x1df
-#define KEY_FN_D		0x1e0
-#define KEY_FN_E		0x1e1
-#define KEY_FN_F		0x1e2
-#define KEY_FN_S		0x1e3
-#define KEY_FN_B		0x1e4
-
-#define KEY_BRL_DOT1		0x1f1
-#define KEY_BRL_DOT2		0x1f2
-#define KEY_BRL_DOT3		0x1f3
-#define KEY_BRL_DOT4		0x1f4
-#define KEY_BRL_DOT5		0x1f5
-#define KEY_BRL_DOT6		0x1f6
-#define KEY_BRL_DOT7		0x1f7
-#define KEY_BRL_DOT8		0x1f8
-#define KEY_BRL_DOT9		0x1f9
-#define KEY_BRL_DOT10		0x1fa
-
-#define KEY_NUMERIC_0		0x200	/* used by phones, remote controls, */
-#define KEY_NUMERIC_1		0x201	/* and other keypads */
-#define KEY_NUMERIC_2		0x202
-#define KEY_NUMERIC_3		0x203
-#define KEY_NUMERIC_4		0x204
-#define KEY_NUMERIC_5		0x205
-#define KEY_NUMERIC_6		0x206
-#define KEY_NUMERIC_7		0x207
-#define KEY_NUMERIC_8		0x208
-#define KEY_NUMERIC_9		0x209
-#define KEY_NUMERIC_STAR	0x20a
-#define KEY_NUMERIC_POUND	0x20b
-
-#define KEY_CAMERA_FOCUS	0x210
-#define KEY_WPS_BUTTON		0x211	/* WiFi Protected Setup key */
-
-#define KEY_TOUCHPAD_TOGGLE	0x212	/* Request switch touchpad on or off */
-#define KEY_TOUCHPAD_ON		0x213
-#define KEY_TOUCHPAD_OFF	0x214
-
-#define KEY_CAMERA_ZOOMIN	0x215
-#define KEY_CAMERA_ZOOMOUT	0x216
-#define KEY_CAMERA_UP		0x217
-#define KEY_CAMERA_DOWN		0x218
-#define KEY_CAMERA_LEFT		0x219
-#define KEY_CAMERA_RIGHT	0x21a
-
-#define KEY_ATTENDANT_ON	0x21b
-#define KEY_ATTENDANT_OFF	0x21c
-#define KEY_ATTENDANT_TOGGLE	0x21d	/* Attendant call on or off */
-#define KEY_LIGHTS_TOGGLE	0x21e	/* Reading light on or off */
-
-#define BTN_DPAD_UP		0x220
-#define BTN_DPAD_DOWN		0x221
-#define BTN_DPAD_LEFT		0x222
-#define BTN_DPAD_RIGHT		0x223
-
-#define KEY_ALS_TOGGLE		0x230	/* Ambient light sensor */
-
-#define BTN_TRIGGER_HAPPY		0x2c0
-#define BTN_TRIGGER_HAPPY1		0x2c0
-#define BTN_TRIGGER_HAPPY2		0x2c1
-#define BTN_TRIGGER_HAPPY3		0x2c2
-#define BTN_TRIGGER_HAPPY4		0x2c3
-#define BTN_TRIGGER_HAPPY5		0x2c4
-#define BTN_TRIGGER_HAPPY6		0x2c5
-#define BTN_TRIGGER_HAPPY7		0x2c6
-#define BTN_TRIGGER_HAPPY8		0x2c7
-#define BTN_TRIGGER_HAPPY9		0x2c8
-#define BTN_TRIGGER_HAPPY10		0x2c9
-#define BTN_TRIGGER_HAPPY11		0x2ca
-#define BTN_TRIGGER_HAPPY12		0x2cb
-#define BTN_TRIGGER_HAPPY13		0x2cc
-#define BTN_TRIGGER_HAPPY14		0x2cd
-#define BTN_TRIGGER_HAPPY15		0x2ce
-#define BTN_TRIGGER_HAPPY16		0x2cf
-#define BTN_TRIGGER_HAPPY17		0x2d0
-#define BTN_TRIGGER_HAPPY18		0x2d1
-#define BTN_TRIGGER_HAPPY19		0x2d2
-#define BTN_TRIGGER_HAPPY20		0x2d3
-#define BTN_TRIGGER_HAPPY21		0x2d4
-#define BTN_TRIGGER_HAPPY22		0x2d5
-#define BTN_TRIGGER_HAPPY23		0x2d6
-#define BTN_TRIGGER_HAPPY24		0x2d7
-#define BTN_TRIGGER_HAPPY25		0x2d8
-#define BTN_TRIGGER_HAPPY26		0x2d9
-#define BTN_TRIGGER_HAPPY27		0x2da
-#define BTN_TRIGGER_HAPPY28		0x2db
-#define BTN_TRIGGER_HAPPY29		0x2dc
-#define BTN_TRIGGER_HAPPY30		0x2dd
-#define BTN_TRIGGER_HAPPY31		0x2de
-#define BTN_TRIGGER_HAPPY32		0x2df
-#define BTN_TRIGGER_HAPPY33		0x2e0
-#define BTN_TRIGGER_HAPPY34		0x2e1
-#define BTN_TRIGGER_HAPPY35		0x2e2
-#define BTN_TRIGGER_HAPPY36		0x2e3
-#define BTN_TRIGGER_HAPPY37		0x2e4
-#define BTN_TRIGGER_HAPPY38		0x2e5
-#define BTN_TRIGGER_HAPPY39		0x2e6
-#define BTN_TRIGGER_HAPPY40		0x2e7
-
-/* We avoid low common keys in module aliases so they don't get huge. */
-#define KEY_MIN_INTERESTING	KEY_MUTE
-#define KEY_MAX			0x2ff
-#define KEY_CNT			(KEY_MAX+1)
-
-/*
- * Relative axes
- */
-
-#define REL_X			0x00
-#define REL_Y			0x01
-#define REL_Z			0x02
-#define REL_RX			0x03
-#define REL_RY			0x04
-#define REL_RZ			0x05
-#define REL_HWHEEL		0x06
-#define REL_DIAL		0x07
-#define REL_WHEEL		0x08
-#define REL_MISC		0x09
-#define REL_MAX			0x0f
-#define REL_CNT			(REL_MAX+1)
-
-/*
- * Absolute axes
- */
-
-#define ABS_X			0x00
-#define ABS_Y			0x01
-#define ABS_Z			0x02
-#define ABS_RX			0x03
-#define ABS_RY			0x04
-#define ABS_RZ			0x05
-#define ABS_THROTTLE		0x06
-#define ABS_RUDDER		0x07
-#define ABS_WHEEL		0x08
-#define ABS_GAS			0x09
-#define ABS_BRAKE		0x0a
-#define ABS_HAT0X		0x10
-#define ABS_HAT0Y		0x11
-#define ABS_HAT1X		0x12
-#define ABS_HAT1Y		0x13
-#define ABS_HAT2X		0x14
-#define ABS_HAT2Y		0x15
-#define ABS_HAT3X		0x16
-#define ABS_HAT3Y		0x17
-#define ABS_PRESSURE		0x18
-#define ABS_DISTANCE		0x19
-#define ABS_TILT_X		0x1a
-#define ABS_TILT_Y		0x1b
-#define ABS_TOOL_WIDTH		0x1c
-
-#define ABS_VOLUME		0x20
-
-#define ABS_MISC		0x28
-
-#define ABS_MT_SLOT		0x2f	/* MT slot being modified */
-#define ABS_MT_TOUCH_MAJOR	0x30	/* Major axis of touching ellipse */
-#define ABS_MT_TOUCH_MINOR	0x31	/* Minor axis (omit if circular) */
-#define ABS_MT_WIDTH_MAJOR	0x32	/* Major axis of approaching ellipse */
-#define ABS_MT_WIDTH_MINOR	0x33	/* Minor axis (omit if circular) */
-#define ABS_MT_ORIENTATION	0x34	/* Ellipse orientation */
-#define ABS_MT_POSITION_X	0x35	/* Center X touch position */
-#define ABS_MT_POSITION_Y	0x36	/* Center Y touch position */
-#define ABS_MT_TOOL_TYPE	0x37	/* Type of touching device */
-#define ABS_MT_BLOB_ID		0x38	/* Group a set of packets as a blob */
-#define ABS_MT_TRACKING_ID	0x39	/* Unique ID of initiated contact */
-#define ABS_MT_PRESSURE		0x3a	/* Pressure on contact area */
-#define ABS_MT_DISTANCE		0x3b	/* Contact hover distance */
-#define ABS_MT_TOOL_X		0x3c	/* Center X tool position */
-#define ABS_MT_TOOL_Y		0x3d	/* Center Y tool position */
-
-
-#define ABS_MAX			0x3f
-#define ABS_CNT			(ABS_MAX+1)
-
-/*
- * Switch events
- */
-
-#define SW_LID			0x00  /* set = lid shut */
-#define SW_TABLET_MODE		0x01  /* set = tablet mode */
-#define SW_HEADPHONE_INSERT	0x02  /* set = inserted */
-#define SW_RFKILL_ALL		0x03  /* rfkill master switch, type "any"
-					 set = radio enabled */
-#define SW_RADIO		SW_RFKILL_ALL	/* deprecated */
-#define SW_MICROPHONE_INSERT	0x04  /* set = inserted */
-#define SW_DOCK			0x05  /* set = plugged into dock */
-#define SW_LINEOUT_INSERT	0x06  /* set = inserted */
-#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
-#define SW_VIDEOOUT_INSERT	0x08  /* set = inserted */
-#define SW_CAMERA_LENS_COVER	0x09  /* set = lens covered */
-#define SW_KEYPAD_SLIDE		0x0a  /* set = keypad slide out */
-#define SW_FRONT_PROXIMITY	0x0b  /* set = front proximity sensor active */
-#define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
-#define SW_LINEIN_INSERT	0x0d  /* set = inserted */
-#define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
-#define SW_MAX			0x0f
-#define SW_CNT			(SW_MAX+1)
-
-/*
- * Misc events
- */
-
-#define MSC_SERIAL		0x00
-#define MSC_PULSELED		0x01
-#define MSC_GESTURE		0x02
-#define MSC_RAW			0x03
-#define MSC_SCAN		0x04
-#define MSC_TIMESTAMP		0x05
-#define MSC_MAX			0x07
-#define MSC_CNT			(MSC_MAX+1)
-
-/*
- * LEDs
- */
-
-#define LED_NUML		0x00
-#define LED_CAPSL		0x01
-#define LED_SCROLLL		0x02
-#define LED_COMPOSE		0x03
-#define LED_KANA		0x04
-#define LED_SLEEP		0x05
-#define LED_SUSPEND		0x06
-#define LED_MUTE		0x07
-#define LED_MISC		0x08
-#define LED_MAIL		0x09
-#define LED_CHARGING		0x0a
-#define LED_MAX			0x0f
-#define LED_CNT			(LED_MAX+1)
-
-/*
- * Autorepeat values
- */
-
-#define REP_DELAY		0x00
-#define REP_PERIOD		0x01
-#define REP_MAX			0x01
-#define REP_CNT			(REP_MAX+1)
-
-/*
- * Sounds
- */
-
-#define SND_CLICK		0x00
-#define SND_BELL		0x01
-#define SND_TONE		0x02
-#define SND_MAX			0x07
-#define SND_CNT			(SND_MAX+1)
-
-/*
- * IDs.
- */
-
-#define ID_BUS			0
-#define ID_VENDOR		1
-#define ID_PRODUCT		2
-#define ID_VERSION		3
-
-#define BUS_PCI			0x01
-#define BUS_ISAPNP		0x02
-#define BUS_USB			0x03
-#define BUS_HIL			0x04
-#define BUS_BLUETOOTH		0x05
-#define BUS_VIRTUAL		0x06
-
-#define BUS_ISA			0x10
-#define BUS_I8042		0x11
-#define BUS_XTKBD		0x12
-#define BUS_RS232		0x13
-#define BUS_GAMEPORT		0x14
-#define BUS_PARPORT		0x15
-#define BUS_AMIGA		0x16
-#define BUS_ADB			0x17
-#define BUS_I2C			0x18
-#define BUS_HOST		0x19
-#define BUS_GSC			0x1A
-#define BUS_ATARI		0x1B
-#define BUS_SPI			0x1C
-
-/*
- * MT_TOOL types
- */
-#define MT_TOOL_FINGER		0
-#define MT_TOOL_PEN		1
-#define MT_TOOL_MAX		1
-
-/*
- * Values describing the status of a force-feedback effect
- */
-#define FF_STATUS_STOPPED	0x00
-#define FF_STATUS_PLAYING	0x01
-#define FF_STATUS_MAX		0x01
-
-/*
- * Structures used in ioctls to upload effects to a device
- * They are pieces of a bigger structure (called ff_effect)
- */
-
-/*
- * All duration values are expressed in ms. Values above 32767 ms (0x7fff)
- * should not be used and have unspecified results.
- */
-
-/**
- * struct ff_replay - defines scheduling of the force-feedback effect
- * @length: duration of the effect
- * @delay: delay before effect should start playing
- */
-struct ff_replay {
-	__u16 length;
-	__u16 delay;
-};
-
-/**
- * struct ff_trigger - defines what triggers the force-feedback effect
- * @button: number of the button triggering the effect
- * @interval: controls how soon the effect can be re-triggered
- */
-struct ff_trigger {
-	__u16 button;
-	__u16 interval;
-};
-
-/**
- * struct ff_envelope - generic force-feedback effect envelope
- * @attack_length: duration of the attack (ms)
- * @attack_level: level at the beginning of the attack
- * @fade_length: duration of fade (ms)
- * @fade_level: level at the end of fade
- *
- * The @attack_level and @fade_level are absolute values; when applying
- * envelope force-feedback core will convert to positive/negative
- * value based on polarity of the default level of the effect.
- * Valid range for the attack and fade levels is 0x0000 - 0x7fff
- */
-struct ff_envelope {
-	__u16 attack_length;
-	__u16 attack_level;
-	__u16 fade_length;
-	__u16 fade_level;
-};
-
-/**
- * struct ff_constant_effect - defines parameters of a constant force-feedback effect
- * @level: strength of the effect; may be negative
- * @envelope: envelope data
- */
-struct ff_constant_effect {
-	__s16 level;
-	struct ff_envelope envelope;
-};
-
-/**
- * struct ff_ramp_effect - defines parameters of a ramp force-feedback effect
- * @start_level: beginning strength of the effect; may be negative
- * @end_level: final strength of the effect; may be negative
- * @envelope: envelope data
- */
-struct ff_ramp_effect {
-	__s16 start_level;
-	__s16 end_level;
-	struct ff_envelope envelope;
-};
-
-/**
- * struct ff_condition_effect - defines a spring or friction force-feedback effect
- * @right_saturation: maximum level when joystick moved all way to the right
- * @left_saturation: same for the left side
- * @right_coeff: controls how fast the force grows when the joystick moves
- *	to the right
- * @left_coeff: same for the left side
- * @deadband: size of the dead zone, where no force is produced
- * @center: position of the dead zone
- */
-struct ff_condition_effect {
-	__u16 right_saturation;
-	__u16 left_saturation;
-
-	__s16 right_coeff;
-	__s16 left_coeff;
-
-	__u16 deadband;
-	__s16 center;
-};
-
-/**
- * struct ff_periodic_effect - defines parameters of a periodic force-feedback effect
- * @waveform: kind of the effect (wave)
- * @period: period of the wave (ms)
- * @magnitude: peak value
- * @offset: mean value of the wave (roughly)
- * @phase: 'horizontal' shift
- * @envelope: envelope data
- * @custom_len: number of samples (FF_CUSTOM only)
- * @custom_data: buffer of samples (FF_CUSTOM only)
- *
- * Known waveforms - FF_SQUARE, FF_TRIANGLE, FF_SINE, FF_SAW_UP,
- * FF_SAW_DOWN, FF_CUSTOM. The exact syntax FF_CUSTOM is undefined
- * for the time being as no driver supports it yet.
- *
- * Note: the data pointed by custom_data is copied by the driver.
- * You can therefore dispose of the memory after the upload/update.
- */
-struct ff_periodic_effect {
-	__u16 waveform;
-	__u16 period;
-	__s16 magnitude;
-	__s16 offset;
-	__u16 phase;
-
-	struct ff_envelope envelope;
-
-	__u32 custom_len;
-	__s16 __user *custom_data;
-};
-
-/**
- * struct ff_rumble_effect - defines parameters of a periodic force-feedback effect
- * @strong_magnitude: magnitude of the heavy motor
- * @weak_magnitude: magnitude of the light one
- *
- * Some rumble pads have two motors of different weight. Strong_magnitude
- * represents the magnitude of the vibration generated by the heavy one.
- */
-struct ff_rumble_effect {
-	__u16 strong_magnitude;
-	__u16 weak_magnitude;
-};
-
-/**
- * struct ff_effect - defines force feedback effect
- * @type: type of the effect (FF_CONSTANT, FF_PERIODIC, FF_RAMP, FF_SPRING,
- *	FF_FRICTION, FF_DAMPER, FF_RUMBLE, FF_INERTIA, or FF_CUSTOM)
- * @id: an unique id assigned to an effect
- * @direction: direction of the effect
- * @trigger: trigger conditions (struct ff_trigger)
- * @replay: scheduling of the effect (struct ff_replay)
- * @u: effect-specific structure (one of ff_constant_effect, ff_ramp_effect,
- *	ff_periodic_effect, ff_condition_effect, ff_rumble_effect) further
- *	defining effect parameters
- *
- * This structure is sent through ioctl from the application to the driver.
- * To create a new effect application should set its @id to -1; the kernel
- * will return assigned @id which can later be used to update or delete
- * this effect.
- *
- * Direction of the effect is encoded as follows:
- *	0 deg -> 0x0000 (down)
- *	90 deg -> 0x4000 (left)
- *	180 deg -> 0x8000 (up)
- *	270 deg -> 0xC000 (right)
- */
-struct ff_effect {
-	__u16 type;
-	__s16 id;
-	__u16 direction;
-	struct ff_trigger trigger;
-	struct ff_replay replay;
-
-	union {
-		struct ff_constant_effect constant;
-		struct ff_ramp_effect ramp;
-		struct ff_periodic_effect periodic;
-		struct ff_condition_effect condition[2]; /* One for each axis */
-		struct ff_rumble_effect rumble;
-	} u;
-};
-
-/*
- * Force feedback effect types
- */
-
-#define FF_RUMBLE	0x50
-#define FF_PERIODIC	0x51
-#define FF_CONSTANT	0x52
-#define FF_SPRING	0x53
-#define FF_FRICTION	0x54
-#define FF_DAMPER	0x55
-#define FF_INERTIA	0x56
-#define FF_RAMP		0x57
-
-#define FF_EFFECT_MIN	FF_RUMBLE
-#define FF_EFFECT_MAX	FF_RAMP
-
-/*
- * Force feedback periodic effect types
- */
-
-#define FF_SQUARE	0x58
-#define FF_TRIANGLE	0x59
-#define FF_SINE		0x5a
-#define FF_SAW_UP	0x5b
-#define FF_SAW_DOWN	0x5c
-#define FF_CUSTOM	0x5d
-
-#define FF_WAVEFORM_MIN	FF_SQUARE
-#define FF_WAVEFORM_MAX	FF_CUSTOM
-
-/*
- * Set ff device properties
- */
-
-#define FF_GAIN		0x60
-#define FF_AUTOCENTER	0x61
-
-#define FF_MAX		0x7f
-#define FF_CNT		(FF_MAX+1)
-
-#endif /* _UAPI_INPUT_H */
-- 
2.41.0


From be79a39a18894b0a512530d618aa933ec6d785cd Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 9 Jan 2014 20:00:50 +0100
Subject: [PATCH 04/16] Add a little ichiic(4) manual page.

---
 share/man/man4/Makefile |  8 +++---
 share/man/man4/ichiic.4 | 59 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 3 deletions(-)
 create mode 100644 share/man/man4/ichiic.4

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index f9a0c47232..d9c5a6d136 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -108,6 +108,7 @@ MAN=	aac.4 \
 	hptiop.4 \
 	hptmv.4 \
 	hptrr.4 \
+	ichiic.4 \
 	ichsmb.4 \
 	ichwd.4 \
 	icmp.4 \
@@ -438,12 +439,13 @@ MLINKS+=fwe.4 if_fwe.4
 MLINKS+=fxp.4 if_fxp.4
 MLINKS+=gif.4 if_gif.4
 MLINKS+=gre.4 if_gre.4
+MLINKS+=ichiic.4 ig.4
+MLINKS+=igb.4 if_igb.4
+MLINKS+=iicbus.4 ic.4 \
+	iicbus.4 if_ic.4
 MLINKS+=ipfirewall.4 ipaccounting.4 \
 	ipfirewall.4 ipacct.4 \
 	ipfirewall.4 ipfw.4
-MLINKS+=iicbus.4 ic.4 \
-	iicbus.4 if_ic.4
-MLINKS+=igb.4 if_igb.4
 MLINKS+=iwi.4 if_iwi.4
 #MLINKS+=iwl.4 if_iwl.4
 MLINKS+=iwn.4 if_iwn.4
diff --git a/share/man/man4/ichiic.4 b/share/man/man4/ichiic.4
new file mode 100644
index 0000000000..f7da4c4964
--- /dev/null
+++ b/share/man/man4/ichiic.4
@@ -0,0 +1,59 @@
+.\"
+.\" Copyright (c) 2014 The DragonFly Project.  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.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\" 3. Neither the name of The DragonFly Project nor the names of its
+.\"    contributors may be used to endorse or promote products derived
+.\"    from this software without specific, prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+.\" ``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 THE
+.\" COPYRIGHT HOLDERS OR CONTRIBUTORS 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.
+.\"
+.Dd January 9, 2014
+.Dt ICHIIC 4
+.Os
+.Sh NAME
+.Nm ichiic
+.Nd Intel 4th generation mobile CPUs integrated I2C device
+.Sh SYNOPSIS
+To compile this driver into the kernel,
+place the following lines in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd device pci
+.Cd device smbus
+.Cd device ichiic
+.Ed
+.Pp
+Alternatively, to load the driver as a
+module at boot time, place the following line in
+.Xr loader.conf 5 :
+.Bd -literal -offset indent
+ig4_load="YES"
+.Ed
+.Sh DESCRIPTION
+This driver provides access to the Intel 4th generation mobile CPUs
+integrated I2C device.
+.Sh SEE ALSO
+.Xr smbus 4
+.Sh AUTHORS
+.An Matt Dillon
-- 
2.41.0


From df0c73d24df1649850542992a4ff938dc1c31244 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Thu, 9 Jan 2014 20:02:25 +0100
Subject: [PATCH 05/16] Oops, fix typo in man4/Makefile.

---
 share/man/man4/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index d9c5a6d136..7370fd9cc2 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -439,7 +439,7 @@ MLINKS+=fwe.4 if_fwe.4
 MLINKS+=fxp.4 if_fxp.4
 MLINKS+=gif.4 if_gif.4
 MLINKS+=gre.4 if_gre.4
-MLINKS+=ichiic.4 ig.4
+MLINKS+=ichiic.4 ig4.4
 MLINKS+=igb.4 if_igb.4
 MLINKS+=iicbus.4 ic.4 \
 	iicbus.4 if_ic.4
-- 
2.41.0


From 138860753bb03c3734ea42a32a7abd9c13060d65 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Jan 2014 15:06:39 -0800
Subject: [PATCH 06/16] cyapa - Introduce better three-finger button emulation

* Change the three-finger button emulation such that the third finger that
  you use to tap will emulate the LEFT, MIDDLE, or RIGHT buttons depending
  on its X position relative to the other two fingers that are being held
  down.

  e.g. if you arrange fingers left-to-right A, B, C, and you hold B and C
  on the pad and tap A, that's a LEFT button.  If you hold A and C and
  tap B, that's a middle button, and if you hold A and B and tap C, that's
  a right button.

* This methodology allows all three buttons to be emulated cleanly without
  having to depress the trackpad's physical button.

* Document all jestures.
---
 sys/dev/smbus/cyapa/cyapa.c | 132 +++++++++++++++++++++++++++++++-----
 sys/kern/sys_generic.c      |  15 ++--
 2 files changed, 121 insertions(+), 26 deletions(-)

diff --git a/sys/dev/smbus/cyapa/cyapa.c b/sys/dev/smbus/cyapa/cyapa.c
index 6426639588..c75fe301af 100644
--- a/sys/dev/smbus/cyapa/cyapa.c
+++ b/sys/dev/smbus/cyapa/cyapa.c
@@ -58,6 +58,34 @@
  * NOTE: In explorerps/2 mode the slider has only 4 bits of delta resolution
  *	 and may not work as smoothly.  Buttons are recognized as button
  *	 8 and button 9.
+ *
+ *				    FEATURES
+ *
+ * Jitter supression	- Implements 2-pixel hysteresis with memory.
+ *
+ * False-finger supression- Two-fingers-down does not emulate anything,
+ *			    on purpose.
+ *
+ * Slider jesture	- Tap right hand side and slide up or down.
+ *
+ *			  (Three finger jestures)
+ * left button jesture	- Two fingers down on the left, tap/hold right
+ * middle button jesture- Two fingers down left & right, tap/hold middle
+ * right button jesture - Two fingers down on the right, tap/hold left
+ *
+ * track-pad button     - Tap/push physical button, left, middle, or right
+ *			  side of the trackpad will issue a LEFT, MIDDLE, or
+ *			  RIGHT button event.
+ *
+ * track-pad button     - Any tap/slide of more than 32 pixels and pushing
+ *			  harder to articulate the trackpad physical button
+ *			  always issues a LEFT button event.
+ *
+ * first-finger tracking- The X/Y coordinates always track the first finger
+ *			  down.  If you have multiple fingers down and lift
+ *			  up the designated first finger, a new designated
+ *			  first finger will be selected without causing the
+ *			  mouse to jump (delta's are reset).
  */
 #include <sys/kernel.h>
 #include <sys/param.h>
@@ -121,7 +149,8 @@ struct cyapa_softc {
 	short	track_y;
 	short	track_z;
 	uint16_t track_but;
-	char 	track_id;		/* (for movement) */
+	char 	track_id1;		/* first finger id */
+	char 	track_id2;		/* second finger id */
 	short	delta_x;		/* accumulation -> report */
 	short	delta_y;
 	short	delta_z;
@@ -1153,9 +1182,13 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 {
 	int nfingers;
 	int i;
+	int j;
+	int k;
 	short x;
 	short y;
 	short z;
+	short x1;
+	short x2;
 	uint16_t but;	/* high bits used for simulated but4/but5 */
 
 	nfingers = CYAPA_FNGR_NUMFINGERS(regs->fngr);
@@ -1214,25 +1247,24 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 		sc->touch_x = -1;
 		sc->touch_y = -1;
 		sc->touch_z = -1;
-		sc->track_id = -1;
+		sc->track_id1 = -1;
+		sc->track_id2 = -1;
 		sc->track_but = 0;
 		i = 0;
-	} else if (sc->track_id == -1) {
-		/*
-		 * Touch(es), if not tracking for mouse-movement, assign
-		 * mouse-movement to the first finger in the array.
-		 */
-		i = 0;
-		sc->track_id = regs->touch[i].id;
+		j = 0;
+		k = 0;
 	} else {
 		/*
 		 * The id assigned on touch can move around in the array,
 		 * find it.  If that finger is lifted up, assign some other
 		 * finger for mouse tracking and reset track_x and track_y
 		 * to avoid a mouse jump.
+		 *
+		 * If >= 2 fingers are down be sure not to assign i and
+		 * j to the same index.
 		 */
 		for (i = 0; i < nfingers; ++i) {
-			if (sc->track_id == regs->touch[i].id)
+			if (sc->track_id1 == regs->touch[i].id)
 				break;
 		}
 		if (i == nfingers) {
@@ -1240,8 +1272,52 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 			sc->track_x = -1;
 			sc->track_y = -1;
 			sc->track_z = -1;
-			sc->track_id = regs->touch[i].id;
+			sc->track_id1 = regs->touch[i].id;
+			if (sc->track_id2 == sc->track_id1)
+				sc->track_id2 = -1;
+		}
+
+		/*
+		 * A second finger.
+		 */
+		for (j = 0; j < nfingers; ++j) {
+			if (sc->track_id2 == regs->touch[j].id)
+				break;
 		}
+		if (j == nfingers) {
+			if (nfingers >= 2) {
+				if (i == 0)
+					j = 1;
+				else
+					j = 0;
+				sc->track_id2 = regs->touch[j].id;
+			} else {
+				sc->track_id2 = -1;
+				j = 0;
+			}
+		}
+
+		/*
+		 * The third finger is used to tap or tap-hold to simulate
+		 * a button, we don't have to record it persistently.
+		 */
+		if (nfingers >= 3) {
+			k = 0;
+			if (i == 0 || j == 0)
+				k = 1;
+			if (i == 1 || j == 1)
+				k = 2;
+		} else {
+			k = 0;
+		}
+		kprintf("ID %3d,%3d,%3d\t%3d,%3d,%3d\n",
+			sc->track_id1,
+			sc->track_id2,
+			((nfingers >= 3) ? regs->touch[k].id : -1),
+			CYAPA_TOUCH_X(regs, i),
+			CYAPA_TOUCH_X(regs, j),
+			CYAPA_TOUCH_X(regs, k)
+		);
 	}
 
 	/*
@@ -1306,9 +1382,8 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 		but = SIMULATE_BUT4;
 	} else if (nfingers >= 3 && sc->track_z < 0) {
 		/*
-		 * Simulate the left button with 3+ fingers when not in
-		 * slider mode (4 of 5 fingers also works if the trackpad
-		 * is not emulating button-4 and button-5).
+		 * Simulate the left, middle, or right button with 3
+		 * fingers when not in slider mode.
 		 *
 		 * This makes it ultra easy to hit GUI buttons and move
 		 * windows with a light touch, without having to apply the
@@ -1319,13 +1394,36 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 		 * button 4 or button 5.  Leave SIMULATE_LOCK set to
 		 * placemark the condition.  We must go down to 2 fingers
 		 * to release the lock.
+		 *
+		 * LEFT BUTTON: Fingers arranged left-to-right 1 2 3,
+		 *		move mouse with fingers 2 and 3 and tap
+		 *		or hold with finger 1 (to the left of fingers
+		 *		2 and 3).
+		 *
+		 * RIGHT BUTTON: Move mouse with fingers 1 and 2 and tap
+		 *		 or hold with finger 3.
+		 *
+		 * MIDDLE BUTTON: Move mouse with fingers 1 and 3 and tap
+		 *		  or hold with finger 2.
 		 */
+		x1 = CYAPA_TOUCH_X(regs, i);	/* 1st finger down */
+		x2 = CYAPA_TOUCH_X(regs, j);	/* 2nd finger down */
+		x = CYAPA_TOUCH_X(regs, k);	/* 3rd finger (button) down */
 		if (sc->track_but & (SIMULATE_BUT4 |
-				     SIMULATE_BUT5 |
-				     SIMULATE_LOCK))
+					    SIMULATE_BUT5 |
+					    SIMULATE_LOCK)) {
 			but = SIMULATE_LOCK;
-		else
+		} else if (sc->track_but & ~SIMULATE_LOCK) {
+			but = sc->track_but;
+		} else if (x < x1 && x < x2) {
 			but = CYAPA_FNGR_LEFT;
+		} else if (x > x1 && x < x2) {
+			but = CYAPA_FNGR_MIDDLE;
+		} else if (x > x2 && x < x1) {
+			but = CYAPA_FNGR_MIDDLE;
+		} else {
+			but = CYAPA_FNGR_RIGHT;
+		}
 	} else if (nfingers == 2 || (nfingers >= 2 && sc->track_z >= 0)) {
 		/*
 		 * If 2 fingers are held down or 2 or more fingers are held
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 6351dfb3d3..1b9425417b 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -673,21 +673,20 @@ mapped_ioctl(int fd, u_long com, caddr_t uspc_data, struct ioctl_map *map,
 		goto done;
 	}
 
-	if (size > sizeof (ubuf.stkbuf)) {
+	if ((com & IOC_VOID) == 0 && size > sizeof(ubuf.stkbuf)) {
 		memp = kmalloc(size, M_IOCTLOPS, M_WAITOK);
 		data = memp;
 	} else {
 		memp = NULL;
 		data = ubuf.stkbuf;
 	}
-	if ((com & IOC_IN) != 0) {
+	if (com & IOC_VOID) {
+		*(caddr_t *)data = uspc_data;
+	} else if (com & IOC_IN) {
 		if (size != 0) {
 			error = copyin(uspc_data, data, (size_t)size);
-			if (error) {
-				if (memp != NULL)
-					kfree(memp, M_IOCTLOPS);
+			if (error)
 				goto done;
-			}
 		} else {
 			*(caddr_t *)data = uspc_data;
 		}
@@ -697,8 +696,6 @@ mapped_ioctl(int fd, u_long com, caddr_t uspc_data, struct ioctl_map *map,
 		 * gets back something deterministic.
 		 */
 		bzero(data, (size_t)size);
-	} else if ((com & IOC_VOID) != 0) {
-		*(caddr_t *)data = uspc_data;
 	}
 
 	switch (com) {
@@ -735,9 +732,9 @@ mapped_ioctl(int fd, u_long com, caddr_t uspc_data, struct ioctl_map *map,
 			error = copyout(data, uspc_data, (size_t)size);
 		break;
 	}
+done:
 	if (memp != NULL)
 		kfree(memp, M_IOCTLOPS);
-done:
 	fdrop(fp);
 	return(error);
 }
-- 
2.41.0


From 42164ccbf31ac39c87bb9687f7c137f5e6816210 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Jan 2014 18:01:29 -0800
Subject: [PATCH 07/16] cyapa - Add false 3-finger button and add emulation for
 all three buttons

* 3-finger sequences can now be used to emulate all three buttons
  rather than just the left button.

  When you place three fingers down, the one you place last and/or
  the one you tap determines the button.  If the left finger is last
  then the LEFT mouse button is emulation.  Middle finger (of the
  three) emulates the MIDDLE mouse button, and the right finger
  emulates the right mouse button.  Only one button can be emulated
  at a time.

* Add detection for false 3-finger buttons.  When you place all three
  fingers down at the same time within 1/25 of a second this is detected
  and will emulate NO fingers.  You can then simply tap the finger you
  want after moving the mouse pointer to where you want.

  (In addition to the normal one-finger or two-finger mousing, this also
  allows you to mouse with three fingers).

* WARNING!  These trackpads have a limitation when three or more
  fingers are down.  This makes emulating a 4-finger or 5-finger
  'claw' (for button-4 or button-5) very difficult so we currently
  do not support that.

  If three or more fingers are placed on the pad in a horizontal line
  (all Y coordinates are the same), the pad will get confused after
  a few seconds.  It will recalibrate and de-confuse itself if you
  life your hand off the pad for a few seconds.

  The solution is when using 3-finger sequences to place your fingers
  on a SLIGHT diagonal so their Y coordinates are slightly different.
  This will yield much more reliable operation of the trackpadd's
  finger detection function.
---
 sys/dev/smbus/cyapa/cyapa.c | 85 +++++++++++++++++++++++++++++++++----
 1 file changed, 77 insertions(+), 8 deletions(-)

diff --git a/sys/dev/smbus/cyapa/cyapa.c b/sys/dev/smbus/cyapa/cyapa.c
index c75fe301af..4669713b51 100644
--- a/sys/dev/smbus/cyapa/cyapa.c
+++ b/sys/dev/smbus/cyapa/cyapa.c
@@ -66,6 +66,12 @@
  * False-finger supression- Two-fingers-down does not emulate anything,
  *			    on purpose.
  *
+ * False-emulated button handling-
+ *			  Buttons are emulated when three fingers are
+ *			  placed on the pad.  If you place all three
+ *			  fingers down simultaniously, this condition
+ *			  is detected and will not emulate any button.
+ *
  * Slider jesture	- Tap right hand side and slide up or down.
  *
  *			  (Three finger jestures)
@@ -86,6 +92,18 @@
  *			  up the designated first finger, a new designated
  *			  first finger will be selected without causing the
  *			  mouse to jump (delta's are reset).
+ *
+ *				WARNINGS
+ *
+ * These trackpads get confused when three or more fingers are down on the
+ * same horizontal axis and will start to glitch the finger detection.
+ * Removing your hand for a few seconds will allow the trackpad to
+ * recalibrate.  Generally speaking, when using three or more fingers
+ * please try to place at least one finger off-axis (a little above or
+ * below) the other two.
+ *
+ * button-4/button-5 'claw' (4 and 5-finger) sequences have similar
+ * problems.
  */
 #include <sys/kernel.h>
 #include <sys/param.h>
@@ -151,6 +169,7 @@ struct cyapa_softc {
 	uint16_t track_but;
 	char 	track_id1;		/* first finger id */
 	char 	track_id2;		/* second finger id */
+	int	track_nfingers;
 	short	delta_x;		/* accumulation -> report */
 	short	delta_y;
 	short	delta_z;
@@ -160,6 +179,9 @@ struct cyapa_softc {
 	short	touch_x;		/* touch down coordinates */
 	short	touch_y;
 	short	touch_z;
+	int	finger1_ticks;
+	int	finger2_ticks;
+	int	finger3_ticks;
 	uint16_t reported_but;
 
 	struct cyapa_fifo rfifo;	/* device->host */
@@ -174,6 +196,7 @@ struct cyapa_softc {
 	int	resolution;		/* count/mm */
 	int	sample_rate;		/* samples/sec */
 	int	zenabled;		/* z-axis enabled (mode 1 or 2) */
+	int	poll_ticks;
 };
 
 #define CYPOLL_SHUTDOWN	0x0001
@@ -1165,6 +1188,7 @@ cyapa_poll_thread(void *arg)
 			smbus_release_bus(bus, sc->dev);
 		}
 		tsleep(&sc->poll_flags, 0, "cyapw", (hz + freq - 1) / freq);
+		++sc->poll_ticks;
 		if (sc->count == 0)
 			freq = cyapa_slow_freq;
 		else if (isidle)
@@ -1237,6 +1261,46 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 	 * Tracking for local solutions
 	 */
 	cyapa_lock(sc);
+
+	/*
+	 * Track timing for finger-downs.  Used to detect false-3-finger
+	 * button-down.
+	 */
+	switch(nfingers) {
+	case 0:
+		break;
+	case 1:
+		if (sc->track_nfingers == 0)
+			sc->finger1_ticks = sc->poll_ticks;
+		break;
+	case 2:
+		if (sc->track_nfingers <= 0)
+			sc->finger1_ticks = sc->poll_ticks;
+		if (sc->track_nfingers <= 1)
+			sc->finger2_ticks = sc->poll_ticks;
+		break;
+	case 3:
+	default:
+		if (sc->track_nfingers <= 0)
+			sc->finger1_ticks = sc->poll_ticks;
+		if (sc->track_nfingers <= 1)
+			sc->finger2_ticks = sc->poll_ticks;
+		if (sc->track_nfingers <= 2)
+			sc->finger3_ticks = sc->poll_ticks;
+		break;
+	}
+#if 0
+	kprintf("%d->%d %d (%d) (%d)\n",
+		sc->track_nfingers, nfingers,
+		(nfingers >= 1 ? sc->finger1_ticks : 0),
+		(nfingers >= 2 ? sc->finger2_ticks - sc->finger1_ticks : 0),
+		(nfingers >= 3 ? sc->finger3_ticks - sc->finger1_ticks : 0));
+#endif
+	sc->track_nfingers = nfingers;
+
+	/*
+	 * Lookup and track finger indexes in the touch[] array.
+	 */
 	if (nfingers == 0) {
 		sc->track_x = -1;
 		sc->track_y = -1;
@@ -1310,14 +1374,6 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 		} else {
 			k = 0;
 		}
-		kprintf("ID %3d,%3d,%3d\t%3d,%3d,%3d\n",
-			sc->track_id1,
-			sc->track_id2,
-			((nfingers >= 3) ? regs->touch[k].id : -1),
-			CYAPA_TOUCH_X(regs, i),
-			CYAPA_TOUCH_X(regs, j),
-			CYAPA_TOUCH_X(regs, k)
-		);
 	}
 
 	/*
@@ -1405,6 +1461,9 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 		 *
 		 * MIDDLE BUTTON: Move mouse with fingers 1 and 3 and tap
 		 *		  or hold with finger 2.
+		 *
+		 * Finally, detect when all three fingers were placed down
+		 * within one tick of each other.
 		 */
 		x1 = CYAPA_TOUCH_X(regs, i);	/* 1st finger down */
 		x2 = CYAPA_TOUCH_X(regs, j);	/* 2nd finger down */
@@ -1415,6 +1474,16 @@ cyapa_raw_input(struct cyapa_softc *sc, struct cyapa_regs *regs)
 			but = SIMULATE_LOCK;
 		} else if (sc->track_but & ~SIMULATE_LOCK) {
 			but = sc->track_but;
+		} else if ((int)(sc->finger3_ticks - sc->finger1_ticks) <
+				 cyapa_norm_freq / 25 + 1) {
+			/*
+			 * False 3-finger button detection (but still detect
+			 * if the actual physical button is held down).
+			 */
+			if (regs->fngr & CYAPA_FNGR_LEFT)
+				but = CYAPA_FNGR_LEFT;
+			else
+				but = 0;
 		} else if (x < x1 && x < x2) {
 			but = CYAPA_FNGR_LEFT;
 		} else if (x > x1 && x < x2) {
-- 
2.41.0


From 9dd5bb283fc13bec8ddbf5f05db53ceda81f6817 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Thu, 9 Jan 2014 19:33:20 -0800
Subject: [PATCH 08/16] kernel - Fix bug in last commit to sys_generic.c

* memp can be uninitialized if the goto done occurs.
---
 sys/kern/sys_generic.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 1b9425417b..d384589cb5 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -584,6 +584,7 @@ mapped_ioctl(int fd, u_long com, caddr_t uspc_data, struct ioctl_map *map,
 
 	KKASSERT(p);
 	cred = td->td_ucred;
+	memp = NULL;
 
 	fp = holdfp(p->p_fd, fd, FREAD|FWRITE);
 	if (fp == NULL)
-- 
2.41.0


From 0483f64b0ecc9726c851f15ee1d7455459c774ee Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 10 Jan 2014 08:11:50 +0100
Subject: [PATCH 09/16] getosreldate.3: Update a bit (fix header for prototype,
 RETURN VALUES).

---
 lib/libc/gen/getosreldate.3 | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/libc/gen/getosreldate.3 b/lib/libc/gen/getosreldate.3
index 17bcfbd00f..4e9fc992d0 100644
--- a/lib/libc/gen/getosreldate.3
+++ b/lib/libc/gen/getosreldate.3
@@ -30,26 +30,32 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/lib/libc/gen/getosreldate.3,v 1.1.2.1 2003/02/02 02:54:03 trhodes Exp $
-.\" $DragonFly: src/lib/libc/gen/getosreldate.3,v 1.6 2008/02/11 16:01:11 matthias Exp $
 .\"
-.Dd February 11, 2008
+.Dd January 10, 2014
 .Dt GETOSRELDATE 3
 .Os
 .Sh NAME
 .Nm getosreldate
-.Nd get the value of __DragonFly_version
+.Nd get the value of
+.Dv __DragonFly_version
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
-.In osreldate.h
+.In unistd.h
 .Ft int
 .Fn getosreldate void
 .Sh DESCRIPTION
 The
 .Fn getosreldate
-function should return a 32-bit integer showing the version of
+function returns an integer showing the version of the currently running
 .Dx
-that a program was compiled on, and maybe running on (if 2.0 or better).
+kernel.
+.Sh RETURN VALUES
+In case of failure, the
+.Fn getosreldate
+functions returns -1 and the global variable
+.Va errno
+is set to indicate the error.
 .Sh HISTORY
 The
 .Fn getosreldate
-- 
2.41.0


From 42a0d440facef77c249bb2dc21bb37e0ef27806c Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 10 Jan 2014 08:12:14 +0100
Subject: [PATCH 10/16] libc/getosreldate: Include <unistd.h> for prototype.

---
 lib/libc/gen/getosreldate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/libc/gen/getosreldate.c b/lib/libc/gen/getosreldate.c
index 230d00490a..da85e52708 100644
--- a/lib/libc/gen/getosreldate.c
+++ b/lib/libc/gen/getosreldate.c
@@ -32,12 +32,13 @@
  *
  * @(#)gethostid.c	8.1 (Berkeley) 6/2/93
  * $FreeBSD: src/lib/libc/gen/getosreldate.c,v 1.4 1999/08/27 23:58:43 peter Exp $
- * $DragonFly: src/lib/libc/gen/getosreldate.c,v 1.3 2005/11/13 00:07:42 swildner Exp $
  */
 
 #include <sys/param.h>
 #include <sys/sysctl.h>
 
+#include <unistd.h>
+
 int
 getosreldate(void)
 {
-- 
2.41.0


From 790693b1907916169cd6aaa4c7832230cc1853ad Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 10 Jan 2014 08:29:12 +0100
Subject: [PATCH 11/16] libc/fork: Fix __fork() definition.

---
 lib/libc/sys/fork.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/libc/sys/fork.c b/lib/libc/sys/fork.c
index a03c953ca7..04a5b50b77 100644
--- a/lib/libc/sys/fork.c
+++ b/lib/libc/sys/fork.c
@@ -37,7 +37,7 @@ void (*cb_parent)(void) = 0;
 void (*cb_child)(void) = 0;
 
 int
-__fork()
+__fork(void)
 {
 	int ret;
 
-- 
2.41.0


From fa8292b0a1ae721d3d1c375976a3597516cc5561 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 10 Jan 2014 20:39:49 +0800
Subject: [PATCH 12/16] atomic: Adjust style a little bit

---
 sys/cpu/i386/include/atomic.h   | 30 ++++++++++--------------------
 sys/cpu/x86_64/include/atomic.h | 30 ++++++++++--------------------
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/sys/cpu/i386/include/atomic.h b/sys/cpu/i386/include/atomic.h
index 0c649fd117..6c6d8faa0f 100644
--- a/sys/cpu/i386/include/atomic.h
+++ b/sys/cpu/i386/include/atomic.h
@@ -193,8 +193,7 @@ atomic_swap_ptr(volatile void **addr, void *value)
 	return (value);
 }
 
-static __inline
-int
+static __inline int
 atomic_poll_acquire_int(volatile u_int *p)
 {
 	u_int data;
@@ -203,8 +202,7 @@ atomic_poll_acquire_int(volatile u_int *p)
 	return(data);
 }
 
-static __inline
-void
+static __inline void
 atomic_poll_release_int(volatile u_int *p)
 {
 	__asm __volatile(MPLOCKED "btrl $0,%0" : "+m" (*p));
@@ -280,15 +278,13 @@ uint64_t atomic_load_acq_64_i586(volatile uint64_t *p);
 
 #else
 
-static __inline
-void
+static __inline void
 atomic_intr_init(__atomic_intr_t *p)
 {
 	*p = 0;
 }
 
-static __inline
-int
+static __inline int
 atomic_intr_handler_disable(__atomic_intr_t *p)
 {
 	int data;
@@ -299,15 +295,13 @@ atomic_intr_handler_disable(__atomic_intr_t *p)
 	return(data);
 }
 
-static __inline
-void
+static __inline void
 atomic_intr_handler_enable(__atomic_intr_t *p)
 {
 	__asm __volatile(MPLOCKED "andl $0xBFFFFFFF,%0" : "+m" (*p));
 }
 
-static __inline
-int
+static __inline int
 atomic_intr_handler_is_enabled(__atomic_intr_t *p)
 {
 	int data;
@@ -329,8 +323,7 @@ atomic_intr_cond_dec(__atomic_intr_t *p)
 	__asm __volatile(MPLOCKED "decl %0" : "+m" (*p));
 }
 
-static __inline
-void
+static __inline void
 atomic_intr_cond_enter(__atomic_intr_t *p, void (*func)(void *), void *arg)
 {
 	__asm __volatile(MPLOCKED "btsl $31,%0; jnc 3f; " \
@@ -351,8 +344,7 @@ atomic_intr_cond_enter(__atomic_intr_t *p, void (*func)(void *), void *arg)
  * Attempt to enter the interrupt condition variable.  Returns zero on
  * success, 1 on failure.
  */
-static __inline
-int
+static __inline int
 atomic_intr_cond_try(__atomic_intr_t *p)
 {
 	int ret;
@@ -367,15 +359,13 @@ atomic_intr_cond_try(__atomic_intr_t *p)
 }
 
 
-static __inline
-int
+static __inline int
 atomic_intr_cond_test(__atomic_intr_t *p)
 {
 	return((int)(*p & 0x80000000));
 }
 
-static __inline
-void
+static __inline void
 atomic_intr_cond_exit(__atomic_intr_t *p, void (*func)(void *), void *arg)
 {
 	__asm __volatile(MPLOCKED "btrl $31,%0; " \
diff --git a/sys/cpu/x86_64/include/atomic.h b/sys/cpu/x86_64/include/atomic.h
index 3a663f4d93..00e6d66a33 100644
--- a/sys/cpu/x86_64/include/atomic.h
+++ b/sys/cpu/x86_64/include/atomic.h
@@ -217,8 +217,7 @@ atomic_swap_ptr(volatile void **addr, void *value)
 	return (value);
 }
 
-static __inline
-int
+static __inline int
 atomic_poll_acquire_int(volatile u_int *p)
 {
 	u_int data;
@@ -227,8 +226,7 @@ atomic_poll_acquire_int(volatile u_int *p)
 	return(data);
 }
 
-static __inline
-void
+static __inline void
 atomic_poll_release_int(volatile u_int *p)
 {
 	__asm __volatile(MPLOCKED "btrl $0,%0" : "+m" (*p));
@@ -303,15 +301,13 @@ void atomic_intr_cond_dec(__atomic_intr_t *p);
 
 #else
 
-static __inline
-void
+static __inline void
 atomic_intr_init(__atomic_intr_t *p)
 {
 	*p = 0;
 }
 
-static __inline
-int
+static __inline int
 atomic_intr_handler_disable(__atomic_intr_t *p)
 {
 	int data;
@@ -322,15 +318,13 @@ atomic_intr_handler_disable(__atomic_intr_t *p)
 	return(data);
 }
 
-static __inline
-void
+static __inline void
 atomic_intr_handler_enable(__atomic_intr_t *p)
 {
 	__asm __volatile(MPLOCKED "andl $0xBFFFFFFF,%0" : "+m" (*p));
 }
 
-static __inline
-int
+static __inline int
 atomic_intr_handler_is_enabled(__atomic_intr_t *p)
 {
 	int data;
@@ -352,8 +346,7 @@ atomic_intr_cond_dec(__atomic_intr_t *p)
 	__asm __volatile(MPLOCKED "decl %0" : "+m" (*p));
 }
 
-static __inline
-void
+static __inline void
 atomic_intr_cond_enter(__atomic_intr_t *p, void (*func)(void *), void *arg)
 {
 	__asm __volatile(MPLOCKED "btsl $31,%0; jnc 3f; " \
@@ -375,8 +368,7 @@ atomic_intr_cond_enter(__atomic_intr_t *p, void (*func)(void *), void *arg)
  * Attempt to enter the interrupt condition variable.  Returns zero on
  * success, 1 on failure.
  */
-static __inline
-int
+static __inline int
 atomic_intr_cond_try(__atomic_intr_t *p)
 {
 	int ret;
@@ -391,15 +383,13 @@ atomic_intr_cond_try(__atomic_intr_t *p)
 }
 
 
-static __inline
-int
+static __inline int
 atomic_intr_cond_test(__atomic_intr_t *p)
 {
 	return((int)(*p & 0x80000000));
 }
 
-static __inline
-void
+static __inline void
 atomic_intr_cond_exit(__atomic_intr_t *p, void (*func)(void *), void *arg)
 {
 	__asm __volatile(MPLOCKED "btrl $31,%0; " \
-- 
2.41.0


From e6dc2aa974f8a4e47e9e93833e486fc94888c4c3 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 10 Jan 2014 21:13:26 +0800
Subject: [PATCH 13/16] x86_64: Extract "Thermal and Power management Feature"

This feature will be used to detect whether LAPIC timer could be enabled
for deep C-states.
---
 sys/cpu/x86_64/include/specialreg.h |  8 ++++++++
 sys/platform/pc64/include/md_var.h  |  1 +
 sys/platform/pc64/x86_64/identcpu.c | 19 +++++++++++++++++++
 sys/platform/pc64/x86_64/initcpu.c  |  1 +
 4 files changed, 29 insertions(+)

diff --git a/sys/cpu/x86_64/include/specialreg.h b/sys/cpu/x86_64/include/specialreg.h
index ec4df7c6b0..11d435a48b 100644
--- a/sys/cpu/x86_64/include/specialreg.h
+++ b/sys/cpu/x86_64/include/specialreg.h
@@ -244,6 +244,14 @@
 #define	CPUID_STDEXT_ADX	0x00080000
 #define	CPUID_STDEXT_SMAP	0x00100000
 
+/*
+ * Thermal and PM Features
+ */
+#define CPUID_THERMAL_ARAT	0x00000004
+#define CPUID_THERMAL_PLN	0x00000010
+#define CPUID_THERMAL_ECMD	0x00000020
+#define CPUID_THERMAL_PTM	0x00000040
+
 /*
  * CPUID manufacturers identifiers
  */
diff --git a/sys/platform/pc64/include/md_var.h b/sys/platform/pc64/include/md_var.h
index 574153895d..31bfeec984 100644
--- a/sys/platform/pc64/include/md_var.h
+++ b/sys/platform/pc64/include/md_var.h
@@ -50,6 +50,7 @@ extern	u_int	amd_feature;
 extern	u_int	amd_feature2;
 extern	u_int	cpu_clflush_line_size;
 extern	u_int	cpu_stdext_feature;
+extern	u_int	cpu_thermal_feature;
 extern	u_int	cpu_fxsr;
 extern	u_int	cpu_xsave;
 extern	u_int	cpu_high;
diff --git a/sys/platform/pc64/x86_64/identcpu.c b/sys/platform/pc64/x86_64/identcpu.c
index 968305c472..6bc7692326 100644
--- a/sys/platform/pc64/x86_64/identcpu.c
+++ b/sys/platform/pc64/x86_64/identcpu.c
@@ -389,6 +389,21 @@ printcpuinfo(void)
 				       );
 			}
 
+			if (cpu_thermal_feature != 0) {
+				kprintf("\n  Thermal and PM Features=0x%b",
+				    cpu_thermal_feature,
+				    "\020"
+				    /* APIC-Timer-always-running */
+				    "\003ARAT"
+				    /* Power limit notification controls */
+				    "\005PLN"
+				    /* Clock modulation duty cycle extension */
+				    "\006ECMD"
+				    /* Package thermal management */
+				    "\007PTM"
+				    );
+			}
+
 			if (cpu_vendor_id == CPU_VENDOR_CENTAUR)
 				print_via_padlock_info();
 			/*
@@ -513,6 +528,10 @@ identify_cpu(void)
 	cpu_feature = regs[3];
 	cpu_feature2 = regs[2];
 
+	if (cpu_high >= 6) {
+		do_cpuid(6, regs);
+		cpu_thermal_feature = regs[0];
+	}
 	if (cpu_high >= 7) {
 		cpuid_count(7, 0, regs);
 		cpu_stdext_feature = regs[1];
diff --git a/sys/platform/pc64/x86_64/initcpu.c b/sys/platform/pc64/x86_64/initcpu.c
index d499247817..a093702bf3 100644
--- a/sys/platform/pc64/x86_64/initcpu.c
+++ b/sys/platform/pc64/x86_64/initcpu.c
@@ -66,6 +66,7 @@ u_int	cpu_xsave;		/* AVX enabled by OS*/
 u_int	cpu_mxcsr_mask;		/* Valid bits in mxcsr */
 u_int	cpu_clflush_line_size = 32;	/* Default CLFLUSH line size */
 u_int	cpu_stdext_feature;
+u_int	cpu_thermal_feature;
 
 /*
  * -1: automatic (enable on h/w, disable on VMs)
-- 
2.41.0


From 3b24650b1ea92a1001a692224955a0472ab156db Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 10 Jan 2014 21:34:11 +0800
Subject: [PATCH 14/16] cputimer/intr: Restart only if the intr cputimer is
 changed

---
 sys/dev/acpica/acpi_cpu_cstate.c | 14 ++++++++++----
 sys/kern/kern_cputimer.c         |  5 ++++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/sys/dev/acpica/acpi_cpu_cstate.c b/sys/dev/acpica/acpi_cpu_cstate.c
index 0364001a76..5dc2c0ba54 100644
--- a/sys/dev/acpica/acpi_cpu_cstate.c
+++ b/sys/dev/acpica/acpi_cpu_cstate.c
@@ -1008,8 +1008,12 @@ acpi_cpu_set_cx_lowest(struct acpi_cpu_softc *sc, int val)
 	     * one shot timer.
 	     */
 	    error = cputimer_intr_select_caps(CPUTIMER_INTR_CAP_NONE);
-	    KKASSERT(!error);
-	    cputimer_intr_restart();
+	    KKASSERT(!error || error == ERESTART);
+	    if (error == ERESTART) {
+		if (bootverbose)
+		    kprintf("exit C3, restart intr cputimer\n");
+		cputimer_intr_restart();
+	    }
     	}
     } else if (type == ACPI_STATE_C3 && old_type != ACPI_STATE_C3) {
 	if (atomic_fetchadd_int(&cpu_c3_ncpus, 1) == 0) {
@@ -1019,9 +1023,11 @@ acpi_cpu_set_cx_lowest(struct acpi_cpu_softc *sc, int val)
 	     * C3 state, i.e. the timer will not hang.
 	     */
 	    error = cputimer_intr_select_caps(CPUTIMER_INTR_CAP_PS);
-	    if (!error) {
+	    if (error == ERESTART) {
+		if (bootverbose)
+		    kprintf("enter C3, restart intr cputimer\n");
 		cputimer_intr_restart();
-	    } else {
+	    } else if (error) {
 		kprintf("no suitable intr cputimer found\n");
 
 		/* Restore */
diff --git a/sys/kern/kern_cputimer.c b/sys/kern/kern_cputimer.c
index 4b86794574..caa7dbd018 100644
--- a/sys/kern/kern_cputimer.c
+++ b/sys/kern/kern_cputimer.c
@@ -414,11 +414,14 @@ cputimer_intr_select_caps(uint32_t caps)
     if (maybe == NULL)
 	return ENOENT;
 
+    if (sys_cputimer_intr == maybe)
+    	return 0;
+
     cputimer_intr_caps = caps;
     error = cputimer_intr_select(maybe, CPUTIMER_INTR_PRIO_MAX);
     KKASSERT(!error);
 
-    return 0;
+    return ERESTART;
 }
 
 static void
-- 
2.41.0


From 8d16855a011a80f265c984e2871c350eec1f9c10 Mon Sep 17 00:00:00 2001
From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 10 Jan 2014 21:35:16 +0800
Subject: [PATCH 15/16] x86_64: Mark LAPIC timer as powersaving capable intr
 cputimer

If CPUID(0x6) has ARAT, then LAPIC timer will not stop in deep C-state.

Thank alexh@ for the necessary information.
---
 sys/platform/pc64/apic/lapic.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sys/platform/pc64/apic/lapic.c b/sys/platform/pc64/apic/lapic.c
index 218abb6bcd..50a68487b4 100644
--- a/sys/platform/pc64/apic/lapic.c
+++ b/sys/platform/pc64/apic/lapic.c
@@ -263,6 +263,14 @@ lapic_init(boolean_t bsp)
 	if (bsp) {
 		lapic_timer_calibrate();
 		if (lapic_timer_enable) {
+			if (cpu_thermal_feature & CPUID_THERMAL_ARAT) {
+				/*
+				 * Local APIC timer will not stop
+				 * in deep C-state.
+				 */
+				lapic_cputimer_intr.caps |=
+				    CPUTIMER_INTR_CAP_PS;
+			}
 			cputimer_intr_register(&lapic_cputimer_intr);
 			cputimer_intr_select(&lapic_cputimer_intr, 0);
 		}
-- 
2.41.0


From 75791611f1f561d77f9954a1525ad59520de66a3 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Fri, 10 Jan 2014 19:44:34 +0100
Subject: [PATCH 16/16] nrelease: Stop putting net/isc-dhcp42-client on the
 ISOs/IMGs.

I don't remember how it got into the list, given that we have dhclient(8).
I assume building the server didn't work without having built the client
at some point in time (maybe in pkgsrc times).

Noticed-by: sephe
---
 nrelease/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nrelease/Makefile b/nrelease/Makefile
index a57ed88860..4328d2bd05 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -42,7 +42,6 @@ DPORTS_EXTRA_PACKAGES?=
 #
 DPORTS_PACKAGES?=	devel/git \
 			dns/bind98 \
-			net/isc-dhcp42-client \
 			net/isc-dhcp42-server \
 			sysutils/cdrtools \
 			${DPORTS_EXTRA_PACKAGES}
-- 
2.41.0