From owner-svn-src-stable-8@FreeBSD.ORG  Wed May 11 19:06:09 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CC95D106566C;
	Wed, 11 May 2011 19:06:09 +0000 (UTC)
	(envelope-from emax@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BC6C08FC13;
	Wed, 11 May 2011 19:06:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4BJ69Xh002511;
	Wed, 11 May 2011 19:06:09 GMT (envelope-from emax@svn.freebsd.org)
Received: (from emax@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4BJ692Y002509;
	Wed, 11 May 2011 19:06:09 GMT (envelope-from emax@svn.freebsd.org)
Message-Id: <201105111906.p4BJ692Y002509@svn.freebsd.org>
From: Maksim Yevmenkin <emax@FreeBSD.org>
Date: Wed, 11 May 2011 19:06:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221787 - stable/8/usr.sbin/bluetooth/bthidd
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 May 2011 19:06:09 -0000

Author: emax
Date: Wed May 11 19:06:09 2011
New Revision: 221787
URL: http://svn.freebsd.org/changeset/base/221787

Log:
  MFC r221448
  
  Encode horizontal scroll events (AC Pan) as button presses (bit 5 and 6)
  
  Submitted by:	David Demelier demelier dot david at gmail dot com

Modified:
  stable/8/usr.sbin/bluetooth/bthidd/hid.c
Directory Properties:
  stable/8/usr.sbin/bluetooth/bthidd/   (props changed)

Modified: stable/8/usr.sbin/bluetooth/bthidd/hid.c
==============================================================================
--- stable/8/usr.sbin/bluetooth/bthidd/hid.c	Wed May 11 18:58:56 2011	(r221786)
+++ stable/8/usr.sbin/bluetooth/bthidd/hid.c	Wed May 11 19:06:09 2011	(r221787)
@@ -229,6 +229,17 @@ hid_interrupt(bthid_session_p s, uint8_t
 				break;
 
 			switch (usage) {
+			case HUC_AC_PAN:
+				/* Horizontal scroll */
+				if (val < 0)
+					mouse_butt |= (1 << 5);
+				else
+					mouse_butt |= (1 << 6);
+
+				mevents ++;
+				val = 0;
+				break;
+
 			case 0xb5: /* Scan Next Track */
 				val = 0x19;
 				break;