update to bcmfw version 2.0

this version now handles modern Broadcom chips, which attach
as normal with the builtin firmware but can be upgraded over
the Host Controller Interface.

5 files changed, 18 insertions, 15 deletions

diff --git a/sysutils/bcmfw/DESCR b/sysutils/bcmfw/DESCR
index 891588cc5ce..dadc1e7a8de 100644
--- a/sysutils/bcmfw/DESCR
+++ b/sysutils/bcmfw/DESCR
@@ -1 +1 @@
-Firmware loading utility for Broadcom BCM2033 chip based Bluetooth USB devices.
+Firmware loading utility for Broadcom chip based Bluetooth USB devices.
diff --git a/sysutils/bcmfw/Makefile b/sysutils/bcmfw/Makefile
index b38c159cc0d..09a4e1b3adc 100644
--- a/sysutils/bcmfw/Makefile
+++ b/sysutils/bcmfw/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.9 2014/12/30 08:57:00 plunky Exp $
+# $NetBSD: Makefile,v 1.10 2016/02/17 10:58:19 plunky Exp $
 
-DISTNAME=		bcmfw-1.0
+DISTNAME=		bcmfw-2.0
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.NetBSD.org/~plunky/
-DISTFILES=		bcmfw-1.0.tar.gz		\
+DISTFILES=		${DISTNAME}.tar.gz		\
 			bluez-firmware-1.2.tar.gz
 SITES.bluez-firmware-1.2.tar.gz= \
 			http://bluez.sourceforge.net/download/
 
 MAINTAINER=		plunky@NetBSD.org
-COMMENT=		Broadcom 2033 Bluetooth Firmware Loader
+COMMENT=		Broadcom Bluetooth Firmware Loader
 LICENSE=		bcmfw-license
 
 RESTRICTED=		No clear permission to redistribute firmware
@@ -27,17 +27,19 @@ INSTALLATION_DIRS=	${PKGMANDIR}/man8 ${FIRMWARE_DIR} sbin
 PLIST_SUBST+=		FIRMWARE_DIR=${FIRMWARE_DIR}
 
 SUBST_CLASSES+=		dir
-SUBST_FILES.dir=	bcmfw.8 bcmfw.c
-SUBST_SED.dir=		-e 's,BCM2033-,${PREFIX}/${FIRMWARE_DIR}/&,'
+SUBST_FILES.dir=	bcmfw.8
+SUBST_SED.dir=		-e 's,/libdata/bcmfw,${PREFIX}/${FIRMWARE_DIR}&,'
 SUBST_STAGE.dir=	post-patch
 SUBST_MESSAGE.dir=	Fixing path to firmware directory.
 
 USE_BSD_MAKEFILE=	yes
 
+MAKE_FLAGS+=		BCMFW_DIR=${PREFIX}/${FIRMWARE_DIR}
 MAKE_FLAGS+=		CWARNFLAGS.clang=-Wno-error=tautological-compare
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bcmfw ${DESTDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/bcmfw-install ${DESTDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/bcmfw.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM-LEGAL.txt ${DESTDIR}${PREFIX}/${FIRMWARE_DIR}
 	${INSTALL_DATA} ${WRKDIR}/bluez-firmware-1.2/broadcom/BCM2033-FW.bin ${DESTDIR}${PREFIX}/${FIRMWARE_DIR}
diff --git a/sysutils/bcmfw/PLIST b/sysutils/bcmfw/PLIST
index fd3463350bf..63ebdcca0a9 100644
--- a/sysutils/bcmfw/PLIST
+++ b/sysutils/bcmfw/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/11 14:05:14 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/02/17 10:58:19 plunky Exp $
 man/man8/bcmfw.8
 sbin/bcmfw
+sbin/bcmfw-install
 ${FIRMWARE_DIR}/BCM-LEGAL.txt
 ${FIRMWARE_DIR}/BCM2033-FW.bin
 ${FIRMWARE_DIR}/BCM2033-MD.hex
diff --git a/sysutils/bcmfw/distinfo b/sysutils/bcmfw/distinfo
index ce15fd35fce..542be687115 100644
--- a/sysutils/bcmfw/distinfo
+++ b/sysutils/bcmfw/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:07 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/02/17 10:58:19 plunky Exp $
 
-SHA1 (bcmfw-1.0.tar.gz) = f5bff709b814ead7b4cfd6fc71e28ae72ea84166
-RMD160 (bcmfw-1.0.tar.gz) = 0a1c5cddb36beee337d975d612fb03ba66a9f9c1
-SHA512 (bcmfw-1.0.tar.gz) = 652564bdab1ae7e557f573e6fea9fdc977e160f8a029e25001f28c0a96b45d103aec2e174794fe3efe1cba1a849953dfe2286d870474e2f786a144c90cfec452
-Size (bcmfw-1.0.tar.gz) = 3387 bytes
+SHA1 (bcmfw-2.0.tar.gz) = 94f6881e0772333599b6cae0b7938d99d2959187
+RMD160 (bcmfw-2.0.tar.gz) = 14c6d1e5ba4266377a34655c082f3a9b3432469f
+SHA512 (bcmfw-2.0.tar.gz) = 7bab88f4ea5a4fba5eb3cee90c6acc53a7be170d9eaf5dcaadd8fc30a2e941a275760261d326ea2721be854fc0304675f7190615853718be1630f48cb96c6eb7
+Size (bcmfw-2.0.tar.gz) = 11822 bytes
 SHA1 (bluez-firmware-1.2.tar.gz) = 43f98fdd518a2b4371d25015aaafb1d6f3cbde2c
 RMD160 (bluez-firmware-1.2.tar.gz) = 1651dd837c2263cf5d6d5d4da30664cf408b0ba9
 SHA512 (bluez-firmware-1.2.tar.gz) = 15db2f9d38a496882e4cc3754af1e58aa99e1b849f2066c541d76c66a8ffdc5532799fe1fd473cfc158bf5ea86a46687716cbcf83c6dcac0ce66d97d679648dd
diff --git a/sysutils/bcmfw/files/bcmfw.sh b/sysutils/bcmfw/files/bcmfw.sh
index 599ba272f81..597e2ae03ad 100644
--- a/sysutils/bcmfw/files/bcmfw.sh
+++ b/sysutils/bcmfw/files/bcmfw.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: bcmfw.sh,v 1.1.1.1 2006/12/07 20:30:48 plunky Exp $
+# $NetBSD: bcmfw.sh,v 1.2 2016/02/17 10:58:19 plunky Exp $
 #
 
 # PROVIDE: bcmfw
@@ -12,7 +12,7 @@ $_rc_subr_loaded . /etc/rc.subr
 name="bcmfw"
 rcvar=${name}
 command="@PREFIX@/sbin/${name}"
-command_args="${bcmfw_args:-ugen0}"
+command_args="${bcmfw_args:--q ugen0}"
 
 load_rc_config ${name}
 run_rc_command "$1"