bwn update

[Felix Friedlander]

Hi all,
So, I've been working a bit on the bwn(4) driver, updating it to support newer cards, but I've hit a bit of a dead end. I've successfully made siba(4) recognise the card, but much more mork needs to be done and it's a bit beyond my skills (at least without help). 

However, I _have_ ported the new(er) firmware, and it seems to work OK even on older cards. This will need more testing, so if anyone has a card currently supported by bwn(4) and would like to give it a go, the diff against net/bwn-firmware-kmod is below:


Index: Makefile
===================================================================
--- Makefile	(revision 391018)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bwn-firmware
-PORTVERSION=	0.1.0
+PORTVERSION=	0.2.0
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.openwrt.org/sources/ \
 		http://mirror2.openwrt.org/sources/
@@ -24,24 +24,11 @@
 	lp0bsinitvals14 lp0bsinitvals15					\
 	n0bsinitvals11
 
-FIRMWARES_LP=								\
-	ucode ucode5 ucode11 ucode13 ucode14 ucode15			\
-	pcm5 a0g1initvals5 a0g0initvals5				\
-	b0g0initvals5 b0g0initvals13 a0g1bsinitvals5 a0g0bsinitvals5	\
-	b0g0bsinitvals5 						\
-	lp0initvals13 lp0initvals14 lp0initvals15 lp0bsinitvals13	\
-	lp0bsinitvals14 lp0bsinitvals15					\
-	n0bsinitvals11
-
 WRKSRC=		${WRKDIR}
 FWNAME=		bwn_v4
 FWFILE=		broadcom-wl-${FWVERSION}.tar.bz2
-FWVERSION=	4.150.10.5
+FWVERSION=	5.100.138
 KMODNAME=	${FWNAME}_ucode
-FWNAME_LP=	bwn_v4_lp
-FWFILE_LP=	broadcom-wl-${FWVERSION_LP}.tar.bz2
-FWVERSION_LP=	4.178.10.4
-KMODNAME_LP=	${FWNAME_LP}_ucode
 PLIST_SUB=	KMODNAME="${KMODNAME}" \
 		KMODNAME_LP="${KMODNAME_LP}"
 
@@ -54,9 +41,8 @@
 	tar xjf ${DISTDIR}/${FWFILE}
 	mkdir -p ${WRKSRC}/bg
 	b43-fwcutter -w ${WRKSRC}/bg \
-	   ${WRKSRC}/broadcom-wl-${FWVERSION}/driver/wl_apsta_mimo.o
+	   ${WRKSRC}/broadcom-wl-${FWVERSION}/linux/wl_apsta.o
 	${TOUCH} ${WRKSRC}/bg/v4/ucode.fw
-
 	@${ECHO_CMD} "KMOD= ${KMODNAME}" > ${WRKSRC}/bg/v4/Makefile
 	@${ECHO_CMD} "FIRMWS= ${FIRMWARES:C/.*/&.fw:${FWNAME}_&/}" >> \
 		${WRKSRC}/bg/v4/Makefile
@@ -63,20 +49,7 @@
 	@${ECHO_CMD} ".include <bsd.kmod.mk>" >> ${WRKSRC}/bg/v4/Makefile
 	@cd ${WRKSRC}/bg/v4; make all
 
-	cd ${WRKSRC} && \
-	tar xjf ${DISTDIR}/${FWFILE_LP}
-	mkdir -p ${WRKSRC}/lp
-	b43-fwcutter -w ${WRKSRC}/lp \
-	   ${WRKSRC}/broadcom-wl-${FWVERSION_LP}/linux/wl_apsta.o
-	${TOUCH} ${WRKSRC}/lp/v4/ucode.fw
-	@${ECHO_CMD} "KMOD= ${KMODNAME_LP}" > ${WRKSRC}/lp/v4/Makefile
-	@${ECHO_CMD} "FIRMWS= ${FIRMWARES_LP:C/.*/&.fw:${FWNAME_LP}_&/}" >> \
-		${WRKSRC}/lp/v4/Makefile
-	@${ECHO_CMD} ".include <bsd.kmod.mk>" >> ${WRKSRC}/lp/v4/Makefile
-	@cd ${WRKSRC}/lp/v4; make all
-
 do-install:
 	@cd ${WRKSRC}/bg/v4; ${SETENV} ${MAKE_ENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install
-	@cd ${WRKSRC}/lp/v4; ${SETENV} ${MAKE_ENV} KMODDIR="${STAGEDIR}${KMODDIR}" make install
 
 .include <bsd.port.mk>

Index: distinfo
===================================================================
--- distinfo	(revision 391018)
+++ distinfo	(working copy)
@@ -1,4 +1,2 @@
-SHA256 (broadcom-wl-4.150.10.5.tar.bz2) = a9f4e276a4d8d3a1cd0f2eb87080ae89b77f0a7140f06d4e9e2135fc44fdd533
-SIZE (broadcom-wl-4.150.10.5.tar.bz2) = 3888794
-SHA256 (broadcom-wl-4.178.10.4.tar.bz2) = 32f6ad98facbb9045646fdc8b54bb03086d204153253f9c65d0234a5d90ae53f
-SIZE (broadcom-wl-4.178.10.4.tar.bz2) = 5986780
+SHA256 (broadcom-wl-5.100.138.tar.bz2) = f1e7067aac5b62b67b8b6e4c517990277804339ac16065eb13c731ff909ae46f
+SIZE (broadcom-wl-5.100.138.tar.bz2) = 13514651


Note that this one firmware replaces the two previous firmwares (standard and low-power). I would be grateful if anyone else could try this firmware out, and let me know if you have any issues.

In the meantime, Adrian is going to help find a developer from the Linux b43 driver to maybe help us out a bit. But don't expect a working driver anytime soon :-)

-- 
Felix Friedlander <felixphew0 at gmail.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-wireless/attachments/20150701/86d44036/attachment.bin>