svn commit: r352102 - in stable/12: targets/pseudo/userland tools/build/mk usr.sbin/bluetooth usr.sbin/bluetooth/iwmbtfw

[Vladimir Kondratyev]

Author: wulf
Date: Mon Sep  9 18:57:17 2019
New Revision: 352102
URL: https://svnweb.freebsd.org/changeset/base/352102

Log:
  MFC r351197, r351199:
  
  iwmbtfw: Firmware loader for Intel Wireless 8260 based Bluetooth USB devices
  
  Currently supported models are: 8260, 8265, 9560, 9260 and 22161.
  Firmware files can be installed with comms/iwmbt-firmware port.
  
  PR:			237083
  Reviewed by:		hps, emax
  Differential Revision:	https://reviews.freebsd.org/D21071

Added:
  stable/12/usr.sbin/bluetooth/iwmbtfw/
     - copied from r351197, head/usr.sbin/bluetooth/iwmbtfw/
Modified:
  stable/12/targets/pseudo/userland/Makefile.depend
  stable/12/tools/build/mk/OptionalObsoleteFiles.inc
  stable/12/usr.sbin/bluetooth/Makefile
  stable/12/usr.sbin/bluetooth/iwmbtfw/Makefile
  stable/12/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/targets/pseudo/userland/Makefile.depend
==============================================================================
--- stable/12/targets/pseudo/userland/Makefile.depend	Mon Sep  9 18:50:38 2019	(r352101)
+++ stable/12/targets/pseudo/userland/Makefile.depend	Mon Sep  9 18:57:17 2019	(r352102)
@@ -443,6 +443,7 @@ DIRDEPS+= \
 	usr.sbin/bluetooth/hccontrol \
 	usr.sbin/bluetooth/hcsecd \
 	usr.sbin/bluetooth/hcseriald \
+	usr.sbin/bluetooth/iwmbtfw \
 	usr.sbin/bluetooth/l2control \
 	usr.sbin/bluetooth/l2ping \
 	usr.sbin/bluetooth/rfcomm_pppd \

Modified: stable/12/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/12/tools/build/mk/OptionalObsoleteFiles.inc	Mon Sep  9 18:50:38 2019	(r352101)
+++ stable/12/tools/build/mk/OptionalObsoleteFiles.inc	Mon Sep  9 18:57:17 2019	(r352102)
@@ -459,6 +459,7 @@ OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
 OLD_FILES+=etc/defaults/bluetooth.device.conf
+OLD_FILES+=etc/devd/iwmbtfw.conf
 OLD_DIRS+=etc/bluetooth
 OLD_FILES+=etc/rc.d/bluetooth
 OLD_FILES+=etc/rc.d/bthidd
@@ -512,6 +513,7 @@ OLD_FILES+=usr/sbin/btpand
 OLD_FILES+=usr/sbin/hccontrol
 OLD_FILES+=usr/sbin/hcsecd
 OLD_FILES+=usr/sbin/hcseriald
+OLD_FILES+=usr/sbin/iwmbtfw
 OLD_FILES+=usr/sbin/l2control
 OLD_FILES+=usr/sbin/l2ping
 OLD_FILES+=usr/sbin/rfcomm_pppd
@@ -589,6 +591,7 @@ OLD_FILES+=usr/share/man/man8/btpand.8.gz
 OLD_FILES+=usr/share/man/man8/hccontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hcsecd.8.gz
 OLD_FILES+=usr/share/man/man8/hcseriald.8.gz
+OLD_FILES+=usr/share/man/man8/iwmbtfw.8.gz
 OLD_FILES+=usr/share/man/man8/l2control.8.gz
 OLD_FILES+=usr/share/man/man8/l2ping.8.gz
 OLD_FILES+=usr/share/man/man8/rfcomm_pppd.8.gz

Modified: stable/12/usr.sbin/bluetooth/Makefile
==============================================================================
--- stable/12/usr.sbin/bluetooth/Makefile	Mon Sep  9 18:50:38 2019	(r352101)
+++ stable/12/usr.sbin/bluetooth/Makefile	Mon Sep  9 18:57:17 2019	(r352102)
@@ -21,6 +21,7 @@ SUBDIR+=	ath3kfw
 SUBDIR+=	bcmfw
 SUBDIR+=	bthidcontrol
 SUBDIR+=	bthidd
+SUBDIR+=	iwmbtfw
 .endif
 
 .include <bsd.subdir.mk>

Modified: stable/12/usr.sbin/bluetooth/iwmbtfw/Makefile
==============================================================================
--- head/usr.sbin/bluetooth/iwmbtfw/Makefile	Sun Aug 18 22:20:28 2019	(r351197)
+++ stable/12/usr.sbin/bluetooth/iwmbtfw/Makefile	Mon Sep  9 18:57:17 2019	(r352102)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-PACKAGE=	bluetooth
 CONFS=		iwmbtfw.conf
 CONFSDIR=       /etc/devd
 PROG=		iwmbtfw

Modified: stable/12/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c
==============================================================================
--- head/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c	Sun Aug 18 22:20:28 2019	(r351197)
+++ stable/12/usr.sbin/bluetooth/iwmbtfw/iwmbt_hw.c	Mon Sep  9 18:57:17 2019	(r352102)
@@ -68,7 +68,7 @@ iwmbt_send_fragment(struct libusb_device_handle *hdl,
 	    &transferred,
 	    timeout);
 
-	if (ret < 0 || transferred != IWMBT_HCI_CMD_SIZE(cmd)) {
+	if (ret < 0 || transferred != (int)IWMBT_HCI_CMD_SIZE(cmd)) {
 		iwmbt_err("libusb_bulk_transfer() failed: err=%s, size=%zu",
 		    libusb_strerror(ret),
 		    IWMBT_HCI_CMD_SIZE(cmd));