[urtwn] migrate urtwn out into sys/dev/urtwn/ .

There's some upcoming work to add new chipset support here and I'd
like to only add 802.11n support to one driver, instead of both
urtwn and rtwn.

There's also missing support for things like 802.11n, some powersave
work, bluetooth integration/coexistence, etc, and also newer parts
(like 8192EU, maybe some 11ac parts, not sure yet.)

So, this is hopefully the first step in a longer set of steps to unify
rtwn/urtwn and extend it with more interesting chipset and functionality
support.

Reviewed by:	kevlo
This commit is contained in:
adrian 2016-03-20 03:54:57 +00:00
parent 34220e27d8
commit f835afd5ed
11 changed files with 7 additions and 6 deletions

View File

@ -78,8 +78,8 @@ __FBSDID("$FreeBSD$");
#include <dev/usb/usb_debug.h> #include <dev/usb/usb_debug.h>
#include <dev/usb/wlan/if_urtwnreg.h> #include <dev/urtwn/if_urtwnreg.h>
#include <dev/usb/wlan/if_urtwnvar.h> #include <dev/urtwn/if_urtwnvar.h>
#ifdef USB_DEBUG #ifdef USB_DEBUG
enum { enum {

View File

@ -367,6 +367,8 @@ SUBDIR= \
udf_iconv \ udf_iconv \
ufs \ ufs \
unionfs \ unionfs \
urtwn \
${_urtwnfw} \
usb \ usb \
utopia \ utopia \
${_vesa} \ ${_vesa} \
@ -484,6 +486,7 @@ _ispfw= ispfw
_mwlfw= mwlfw _mwlfw= mwlfw
_ralfw= ralfw _ralfw= ralfw
_rtwnfw= rtwnfw _rtwnfw= rtwnfw
_urtwnfw= urtwnfw
_sf= sf _sf= sf
_ti= ti _ti= ti
_txp= txp _txp= txp

View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../../dev/usb/wlan .PATH: ${.CURDIR}/../../dev/urtwn
.include <src.opts.mk> .include <src.opts.mk>

View File

@ -11,5 +11,5 @@ FIRMWS= ${_FIRM}:${KMOD}:111
# FIRMWARE_LICENSE= realtek # FIRMWARE_LICENSE= realtek
${_FIRM}: ${.CURDIR}/../../../../contrib/dev/urtwn/${_FIRM}.uu ${_FIRM}: ${.CURDIR}/../../../contrib/dev/urtwn/${_FIRM}.uu
uudecode -p $? > ${.TARGET} uudecode -p $? > ${.TARGET}

View File

@ -47,7 +47,6 @@ SUBDIR = usb
SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} \ SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} \
${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw} ${_saf1761otg} ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw} ${_saf1761otg}
SUBDIR += ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw} SUBDIR += ${_rum} ${_run} ${_runfw} ${_uath} upgt usie ural ${_zyd} ${_urtw}
SUBDIR += urtwn ${_urtwnfw}
SUBDIR += atp uhid ukbd ums udbp ufm uep wsp ugold uled SUBDIR += atp uhid ukbd ums udbp ufm uep wsp ugold uled
SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
umct umcs umodem umoscom uplcom uslcom uvisor uvscom umct umcs umodem umoscom uplcom uslcom uvisor uvscom
@ -70,7 +69,6 @@ _rum= rum
_uath= uath _uath= uath
_zyd= zyd _zyd= zyd
_kue= kue _kue= kue
_urtwnfw= urtwnfw
_run= run _run= run
_runfw= runfw _runfw= runfw
_rsu= rsu _rsu= rsu