From 0c91dc1d08c9d6bbf217e418549d2557e3c08e8c Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Sun, 20 Mar 2016 03:54:57 +0000 Subject: [PATCH] [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 --- sys/dev/{usb/wlan => urtwn}/if_urtwn.c | 4 ++-- sys/dev/{usb/wlan => urtwn}/if_urtwnreg.h | 0 sys/dev/{usb/wlan => urtwn}/if_urtwnvar.h | 0 sys/modules/Makefile | 3 +++ sys/modules/{usb => }/urtwn/Makefile | 2 +- sys/modules/{usb => }/urtwnfw/Makefile | 0 sys/modules/{usb => }/urtwnfw/Makefile.inc | 2 +- sys/modules/{usb => }/urtwnfw/urtwnrtl8188eu/Makefile | 0 sys/modules/{usb => }/urtwnfw/urtwnrtl8192cT/Makefile | 0 sys/modules/{usb => }/urtwnfw/urtwnrtl8192cU/Makefile | 0 sys/modules/usb/Makefile | 2 -- 11 files changed, 7 insertions(+), 6 deletions(-) rename sys/dev/{usb/wlan => urtwn}/if_urtwn.c (99%) rename sys/dev/{usb/wlan => urtwn}/if_urtwnreg.h (100%) rename sys/dev/{usb/wlan => urtwn}/if_urtwnvar.h (100%) rename sys/modules/{usb => }/urtwn/Makefile (89%) rename sys/modules/{usb => }/urtwnfw/Makefile (100%) rename sys/modules/{usb => }/urtwnfw/Makefile.inc (81%) rename sys/modules/{usb => }/urtwnfw/urtwnrtl8188eu/Makefile (100%) rename sys/modules/{usb => }/urtwnfw/urtwnrtl8192cT/Makefile (100%) rename sys/modules/{usb => }/urtwnfw/urtwnrtl8192cU/Makefile (100%) diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/urtwn/if_urtwn.c similarity index 99% rename from sys/dev/usb/wlan/if_urtwn.c rename to sys/dev/urtwn/if_urtwn.c index 8b568474d980..9f157959a1fe 100644 --- a/sys/dev/usb/wlan/if_urtwn.c +++ b/sys/dev/urtwn/if_urtwn.c @@ -78,8 +78,8 @@ __FBSDID("$FreeBSD$"); #include -#include -#include +#include +#include #ifdef USB_DEBUG enum { diff --git a/sys/dev/usb/wlan/if_urtwnreg.h b/sys/dev/urtwn/if_urtwnreg.h similarity index 100% rename from sys/dev/usb/wlan/if_urtwnreg.h rename to sys/dev/urtwn/if_urtwnreg.h diff --git a/sys/dev/usb/wlan/if_urtwnvar.h b/sys/dev/urtwn/if_urtwnvar.h similarity index 100% rename from sys/dev/usb/wlan/if_urtwnvar.h rename to sys/dev/urtwn/if_urtwnvar.h diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 8d9e49973c5f..cf0fa6c759e0 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 similarity index 89% rename from sys/modules/usb/urtwn/Makefile rename to sys/modules/urtwn/Makefile index 59fa910aa82c..6a2c9dbe0ecb 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 diff --git a/sys/modules/usb/urtwnfw/Makefile b/sys/modules/urtwnfw/Makefile similarity index 100% rename from sys/modules/usb/urtwnfw/Makefile rename to sys/modules/urtwnfw/Makefile diff --git a/sys/modules/usb/urtwnfw/Makefile.inc b/sys/modules/urtwnfw/Makefile.inc similarity index 81% rename from sys/modules/usb/urtwnfw/Makefile.inc rename to sys/modules/urtwnfw/Makefile.inc index 17c78be08d7d..2a97a097209f 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 similarity index 100% rename from sys/modules/usb/urtwnfw/urtwnrtl8188eu/Makefile rename to sys/modules/urtwnfw/urtwnrtl8188eu/Makefile diff --git a/sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile b/sys/modules/urtwnfw/urtwnrtl8192cT/Makefile similarity index 100% rename from sys/modules/usb/urtwnfw/urtwnrtl8192cT/Makefile rename to sys/modules/urtwnfw/urtwnrtl8192cT/Makefile diff --git a/sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile b/sys/modules/urtwnfw/urtwnrtl8192cU/Makefile similarity index 100% rename from sys/modules/usb/urtwnfw/urtwnrtl8192cU/Makefile rename to sys/modules/urtwnfw/urtwnrtl8192cU/Makefile diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index b236d04b139c..72b123e88325 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