diff options
author | adrian <adrian@FreeBSD.org> | 2016-03-20 03:54:57 +0000 |
---|---|---|
committer | adrian <adrian@FreeBSD.org> | 2016-03-20 03:54:57 +0000 |
commit | f835afd5ed2447f09706dc54af65a491a65f99ff (patch) | |
tree | 5ce20cce8f14e4c66417b5dcfb1ea4882873d97e | |
parent | 34220e27d8f100e547669948e81a9d1155200ee1 (diff) | |
download | FreeBSD-src-f835afd5ed2447f09706dc54af65a491a65f99ff.zip FreeBSD-src-f835afd5ed2447f09706dc54af65a491a65f99ff.tar.gz |
[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
-rw-r--r-- | sys/dev/urtwn/if_urtwn.c (renamed from sys/dev/usb/wlan/if_urtwn.c) | 4 | ||||
-rw-r--r-- | sys/dev/urtwn/if_urtwnreg.h (renamed from sys/dev/usb/wlan/if_urtwnreg.h) | 0 | ||||
-rw-r--r-- | sys/dev/urtwn/if_urtwnvar.h (renamed from sys/dev/usb/wlan/if_urtwnvar.h) | 0 | ||||
-rw-r--r-- | sys/modules/Makefile | 3 | ||||
-rw-r--r-- | sys/modules/urtwn/Makefile (renamed from sys/modules/usb/urtwn/Makefile) | 2 | ||||
-rw-r--r-- | sys/modules/urtwnfw/Makefile (renamed from sys/modules/usb/urtwnfw/Makefile) | 0 | ||||
-rw-r--r-- | sys/modules/urtwnfw/Makefile.inc (renamed from sys/modules/usb/urtwnfw/Makefile.inc) | 2 | ||||
-rw-r--r-- | sys/modules/urtwnfw/urtwnrtl8188eu/Makefile (renamed from sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile) | 0 | ||||
-rw-r--r-- | sys/modules/urtwnfw/urtwnrtl8192cT/Makefile (renamed from sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile) | 0 | ||||
-rw-r--r-- | sys/modules/urtwnfw/urtwnrtl8192cU/Makefile (renamed from sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile) | 0 | ||||
-rw-r--r-- | sys/modules/usb/Makefile | 2 |
11 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/urtwn/if_urtwn.c index 8b56847..9f15795 100644 --- a/sys/dev/usb/wlan/if_urtwn.c +++ b/sys/dev/urtwn/if_urtwn.c @@ -78,8 +78,8 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_debug.h> -#include <dev/usb/wlan/if_urtwnreg.h> -#include <dev/usb/wlan/if_urtwnvar.h> +#include <dev/urtwn/if_urtwnreg.h> +#include <dev/urtwn/if_urtwnvar.h> #ifdef USB_DEBUG enum { diff --git a/sys/dev/usb/wlan/if_urtwnreg.h b/sys/dev/urtwn/if_urtwnreg.h index 72835f3..72835f3 100644 --- a/sys/dev/usb/wlan/if_urtwnreg.h +++ b/sys/dev/urtwn/if_urtwnreg.h diff --git a/sys/dev/usb/wlan/if_urtwnvar.h b/sys/dev/urtwn/if_urtwnvar.h index ba8ca81..ba8ca81 100644 --- a/sys/dev/usb/wlan/if_urtwnvar.h +++ b/sys/dev/urtwn/if_urtwnvar.h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 8d9e499..cf0fa6c 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -367,6 +367,8 @@ SUBDIR= \ udf_iconv \ ufs \ unionfs \ + urtwn \ + ${_urtwnfw} \ usb \ utopia \ ${_vesa} \ @@ -484,6 +486,7 @@ _ispfw= ispfw _mwlfw= mwlfw _ralfw= ralfw _rtwnfw= rtwnfw +_urtwnfw= urtwnfw _sf= sf _ti= ti _txp= txp diff --git a/sys/modules/usb/urtwn/Makefile b/sys/modules/urtwn/Makefile index 59fa910..6a2c9db 100644 --- a/sys/modules/usb/urtwn/Makefile +++ b/sys/modules/urtwn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/wlan +.PATH: ${.CURDIR}/../../dev/urtwn .include <src.opts.mk> diff --git a/sys/modules/usb/urtwnfw/Makefile b/sys/modules/urtwnfw/Makefile index 611b411..611b411 100644 --- a/sys/modules/usb/urtwnfw/Makefile +++ b/sys/modules/urtwnfw/Makefile diff --git a/sys/modules/usb/urtwnfw/Makefile.inc b/sys/modules/urtwnfw/Makefile.inc index 17c78be..2a97a09 100644 --- a/sys/modules/usb/urtwnfw/Makefile.inc +++ b/sys/modules/urtwnfw/Makefile.inc @@ -11,5 +11,5 @@ FIRMWS= ${_FIRM}:${KMOD}:111 # FIRMWARE_LICENSE= realtek -${_FIRM}: ${.CURDIR}/../../../../contrib/dev/urtwn/${_FIRM}.uu +${_FIRM}: ${.CURDIR}/../../../contrib/dev/urtwn/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile b/sys/modules/urtwnfw/urtwnrtl8188eu/Makefile index d3c974e..d3c974e 100644 --- a/sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile +++ b/sys/modules/urtwnfw/urtwnrtl8188eu/Makefile diff --git a/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile b/sys/modules/urtwnfw/urtwnrtl8192cT/Makefile index ef49984..ef49984 100644 --- a/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile +++ b/sys/modules/urtwnfw/urtwnrtl8192cT/Makefile diff --git a/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile b/sys/modules/urtwnfw/urtwnrtl8192cU/Makefile index e9a932c..e9a932c 100644 --- a/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile +++ b/sys/modules/urtwnfw/urtwnrtl8192cU/Makefile diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index b236d04..72b123e 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -47,7 +47,6 @@ SUBDIR = usb SUBDIR += ${_dwc_otg} ehci ${_musb} ohci uhci xhci ${_uss820dci} ${_at91dci} \ ${_atmegadci} ${_avr32dci} ${_rsu} ${_rsufw} ${_saf1761otg} 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 += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ umct umcs umodem umoscom uplcom uslcom uvisor uvscom @@ -70,7 +69,6 @@ _rum= rum _uath= uath _zyd= zyd _kue= kue -_urtwnfw= urtwnfw _run= run _runfw= runfw _rsu= rsu |