 @@ -1,14 +1,14 @@
-/*	$NetBSD: hci.h,v 1.41 2015/11/28 09:04:34 plunky Exp $	*/
+/*	$NetBSD: hci.h,v 1.42 2017/01/28 19:07:16 christos Exp $	*/
 /*-
  * Copyright (c) 2005 Iain Hibbert.
  * Copyright (c) 2006 Itronix Inc.
  * 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
 @@ -44,27 +44,27 @@
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
- * $Id: hci.h,v 1.41 2015/11/28 09:04:34 plunky Exp $
+ * $Id: hci.h,v 1.42 2017/01/28 19:07:16 christos Exp $
  * $FreeBSD: src/sys/netgraph/bluetooth/include/ng_hci.h,v 1.6 2005/01/07 01:45:43 imp Exp $
  */
 /*
  * This file contains everything that applications need to know from
  * Host Controller Interface (HCI). Information taken from Bluetooth
  * Core Specifications (v1.1, v2.0, v2.1 + EDR, v3.0 + HS,
  * v4.0 and v4.2)
+ *
  * This file can be included by both kernel and userland applications.
+ *
  * NOTE: Here and after Bluetooth device is called a "unit". Bluetooth
  *       specification refers to both devices and units. They are the
 @@ -2268,48 +2268,48 @@ typedef struct {
 /*
  * HCI socket filter and get/set routines
+ *
  * for ease of use, we filter 256 possible events/packets
  */
 struct hci_filter {
 	uint32_t	mask[8];	/* 256 bits */
 };
 static __inline void
 hci_filter_set(uint8_t bit, struct hci_filter *filter)
+{
-	uint8_t off = bit - 1;
+	uint8_t off = (uint8_t)((bit - 1) >> 5);
 	uint8_t sh = (uint8_t)((bit - 1) & 0x1f);
-	off >>= 5;
+	filter->mask[off] |= 1 << sh;
 	filter->mask[off] |= (1 << ((bit - 1) & 0x1f));
+}
 static __inline void
 hci_filter_clr(uint8_t bit, struct hci_filter *filter)
+{
-	uint8_t off = bit - 1;
+	uint8_t off = (uint8_t)((bit - 1) >> 5);
 	uint8_t sh = (uint8_t)((bit - 1) & 0x1f);
-	off >>= 5;
+	filter->mask[off] &= ~(1 << sh);
 	filter->mask[off] &= ~(1 << ((bit - 1) & 0x1f));
+}
 static __inline int
 hci_filter_test(uint8_t bit, const struct hci_filter *filter)
+{
-	uint8_t off = bit - 1;
+	uint8_t off = (uint8_t)((bit - 1) >> 5);
 	uint8_t sh = (uint8_t)((bit - 1) & 0x1f);
-	off >>= 5;
+	return filter->mask[off] & (1 << sh);
 	return (filter->mask[off] & (1 << ((bit - 1) & 0x1f)));
+}
 /*
  * HCI socket ioctl's
+ *
  * Apart from GBTINFOA, these are all indexed on the unit name
  */
 #define SIOCGBTINFO	_IOWR('b',  5, struct btreq) /* get unit info */
 #define SIOCGBTINFOA	_IOWR('b',  6, struct btreq) /* get info by address */
 #define SIOCNBTINFO	_IOWR('b',  7, struct btreq) /* next unit info */
 #define SIOCSBTFLAGS	_IOWR('b',  8, struct btreq) /* set unit flags */