From owner-svn-src-user@FreeBSD.ORG  Tue Jul 29 21:22:34 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 34FFF2EE;
 Tue, 29 Jul 2014 21:22:34 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 23170276F;
 Tue, 29 Jul 2014 21:22:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6TLMYwd068027;
 Tue, 29 Jul 2014 21:22:34 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6TLMXlx068025;
 Tue, 29 Jul 2014 21:22:33 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201407292122.s6TLMXlx068025@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Tue, 29 Jul 2014 21:22:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r269264 - user/jceel/soc2014_evdev/head/sys/dev/evdev
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jul 2014 21:22:34 -0000

Author: jceel
Date: Tue Jul 29 21:22:33 2014
New Revision: 269264
URL: http://svnweb.freebsd.org/changeset/base/269264

Log:
  Don't assume 64-bit long.

Modified:
  user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.c
  user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.h

Modified: user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.c
==============================================================================
--- user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.c	Tue Jul 29 21:21:16 2014	(r269263)
+++ user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.c	Tue Jul 29 21:22:33 2014	(r269264)
@@ -66,13 +66,13 @@ static void evdev_client_push(struct evd
 static inline void
 set_bit(unsigned long *array, int bit)
 {
-	array[bit / 64] |= (1LL << (bit % 64));
+	array[bit / LONG_WIDTH] |= (1LL << (bit % LONG_WIDTH));
 }
 
 static inline void
 clr_bit(unsigned long *array, int bit)
 {
-	array[bit / 64] &= ~(1LL << (bit % 64));
+	array[bit / LONG_WIDTH] &= ~(1LL << (bit % LONG_WIDTH));
 }
 
 static inline void

Modified: user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.h
==============================================================================
--- user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.h	Tue Jul 29 21:21:16 2014	(r269263)
+++ user/jceel/soc2014_evdev/head/sys/dev/evdev/evdev.h	Tue Jul 29 21:22:33 2014	(r269264)
@@ -34,6 +34,7 @@
 #include <dev/evdev/input.h>
 
 #define	NAMELEN		80
+#define	LONG_WIDTH	(sizeof(unsigned long) * 8)
 #define	nlongs(x)	(howmany(x, sizeof(unsigned long) * 8))
 
 MALLOC_DECLARE(M_EVDEV);