Date: Fri, 17 Apr 2009 04:07:57 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r191193 - user/thompsa/vaptq/sys/dev/usb/wlan Message-ID: <200904170407.n3H47vH7007719@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Fri Apr 17 04:07:56 2009 New Revision: 191193 URL: http://svn.freebsd.org/changeset/base/191193 Log: Expand and remove usb_wlan.h, it has no real content. Deleted: user/thompsa/vaptq/sys/dev/usb/wlan/usb_wlan.h Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c user/thompsa/vaptq/sys/dev/usb/wlan/if_zyd.c Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c ============================================================================== --- user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c Fri Apr 17 04:04:57 2009 (r191192) +++ user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c Fri Apr 17 04:07:56 2009 (r191193) @@ -26,13 +26,50 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com.tw/ */ -#include "usbdevs.h" -#include <dev/usb/usb.h> -#include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_error.h> +#include <sys/param.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/mbuf.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kdb.h> + +#include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> + +#include <net/bpf.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/ethernet.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/if_types.h> + +#ifdef INET +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#endif + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_radiotap.h> +#include <net80211/ieee80211_amrr.h> #define USB_DEBUG_VAR rum_debug +#include <dev/usb/usb.h> +#include <dev/usb/usb_error.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_lookup.h> #include <dev/usb/usb_process.h> @@ -40,8 +77,8 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_request.h> #include <dev/usb/usb_busdma.h> #include <dev/usb/usb_util.h> +#include "usbdevs.h" -#include <dev/usb/wlan/usb_wlan.h> #include <dev/usb/wlan/if_rumreg.h> #include <dev/usb/wlan/if_rumvar.h> #include <dev/usb/wlan/if_rumfw.h> Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c ============================================================================== --- user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c Fri Apr 17 04:04:57 2009 (r191192) +++ user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c Fri Apr 17 04:07:56 2009 (r191193) @@ -28,13 +28,50 @@ __FBSDID("$FreeBSD$"); * http://www.ralinktech.com/ */ -#include "usbdevs.h" -#include <dev/usb/usb.h> -#include <dev/usb/usb_mfunc.h> -#include <dev/usb/usb_error.h> +#include <sys/param.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/mbuf.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kdb.h> + +#include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> + +#include <net/bpf.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/ethernet.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/if_types.h> + +#ifdef INET +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#endif + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_radiotap.h> +#include <net80211/ieee80211_amrr.h> #define USB_DEBUG_VAR ural_debug +#include <dev/usb/usb.h> +#include <dev/usb/usb_error.h> #include <dev/usb/usb_core.h> #include <dev/usb/usb_lookup.h> #include <dev/usb/usb_process.h> @@ -42,8 +79,9 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_request.h> #include <dev/usb/usb_busdma.h> #include <dev/usb/usb_util.h> +#include "usbdevs.h" + -#include <dev/usb/wlan/usb_wlan.h> #include <dev/usb/wlan/if_uralreg.h> #include <dev/usb/wlan/if_uralvar.h> Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_zyd.c ============================================================================== --- user/thompsa/vaptq/sys/dev/usb/wlan/if_zyd.c Fri Apr 17 04:04:57 2009 (r191192) +++ user/thompsa/vaptq/sys/dev/usb/wlan/if_zyd.c Fri Apr 17 04:07:56 2009 (r191193) @@ -26,11 +26,48 @@ __FBSDID("$FreeBSD$"); * ZyDAS ZD1211/ZD1211B USB WLAN driver. */ -#include "usbdevs.h" +#include <sys/param.h> +#include <sys/sockio.h> +#include <sys/sysctl.h> +#include <sys/lock.h> +#include <sys/mutex.h> +#include <sys/mbuf.h> +#include <sys/kernel.h> +#include <sys/socket.h> +#include <sys/systm.h> +#include <sys/malloc.h> +#include <sys/module.h> +#include <sys/bus.h> +#include <sys/endian.h> +#include <sys/kdb.h> + +#include <machine/bus.h> +#include <machine/resource.h> +#include <sys/rman.h> + +#include <net/bpf.h> +#include <net/if.h> +#include <net/if_arp.h> +#include <net/ethernet.h> +#include <net/if_dl.h> +#include <net/if_media.h> +#include <net/if_types.h> + +#ifdef INET +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/in_var.h> +#include <netinet/if_ether.h> +#include <netinet/ip.h> +#endif + +#include <net80211/ieee80211_var.h> +#include <net80211/ieee80211_regdomain.h> +#include <net80211/ieee80211_radiotap.h> +#include <net80211/ieee80211_amrr.h> + #include <dev/usb/usb.h> -#include <dev/usb/usb_mfunc.h> #include <dev/usb/usb_error.h> - #include <dev/usb/usb_core.h> #include <dev/usb/usb_lookup.h> #include <dev/usb/usb_process.h> @@ -38,8 +75,8 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_request.h> #include <dev/usb/usb_busdma.h> #include <dev/usb/usb_util.h> +#include "usbdevs.h" -#include <dev/usb/wlan/usb_wlan.h> #include <dev/usb/wlan/if_zydreg.h> #include <dev/usb/wlan/if_zydfw.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200904170407.n3H47vH7007719>