diff options
| author | weongyo <weongyo@FreeBSD.org> | 2009-03-07 07:26:22 +0000 |
|---|---|---|
| committer | weongyo <weongyo@FreeBSD.org> | 2009-03-07 07:26:22 +0000 |
| commit | 6d523cd42af824d128b343edb51f35a859902554 (patch) | |
| tree | 2e7363befdd88ff9363f94e0ec33120a942d098f /sys/compat/ndis/kern_ndis.c | |
| parent | 75dde6e038bfb963bde327a29d4eb13ee9f8f294 (diff) | |
| download | FreeBSD-src-6d523cd42af824d128b343edb51f35a859902554.zip FreeBSD-src-6d523cd42af824d128b343edb51f35a859902554.tar.gz | |
o port NDIS USB support from USB1 to the new usb(USB2).
o implement URB_FUNCTION_ABORT_PIPE handling.
o remove unused code related with canceling the timer list for USB
drivers.
o whitespace cleanup and style(9)
Obtained from: hps's original patch
Diffstat (limited to 'sys/compat/ndis/kern_ndis.c')
| -rw-r--r-- | sys/compat/ndis/kern_ndis.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c index 4d32a8b..1ccef55 100644 --- a/sys/compat/ndis/kern_ndis.c +++ b/sys/compat/ndis/kern_ndis.c @@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$"); #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> -#include <legacy/dev/usb/usb.h> -#include <legacy/dev/usb/usbdi.h> +#include <dev/usb/usb.h> +#include <dev/usb/usb_core.h> #include <compat/ndis/pe_var.h> #include <compat/ndis/cfg_var.h> @@ -322,7 +322,7 @@ ndis_create_sysctls(arg) #else TAILQ_FOREACH(e, device_get_sysctl_ctx(sc->ndis_dev), link) { #endif - oidp = e->entry; + oidp = e->entry; if (strcasecmp(oidp->oid_name, vals->nc_cfgkey) == 0) break; oidp = NULL; @@ -571,7 +571,7 @@ ndis_convert_res(arg) struct resource_list brl_rev; struct resource_list_entry *n; #endif - int error = 0; + int error = 0; sc = arg; block = sc->ndis_block; @@ -1231,7 +1231,7 @@ ndis_init_nic(arg) { struct ndis_softc *sc; ndis_miniport_block *block; - ndis_init_handler initfunc; + ndis_init_handler initfunc; ndis_status status, openstatus = 0; ndis_medium mediumarray[NdisMediumMax]; uint32_t chosenmedium, i; @@ -1250,8 +1250,8 @@ ndis_init_nic(arg) for (i = 0; i < NdisMediumMax; i++) mediumarray[i] = i; - status = MSCALL6(initfunc, &openstatus, &chosenmedium, - mediumarray, NdisMediumMax, block, block); + status = MSCALL6(initfunc, &openstatus, &chosenmedium, + mediumarray, NdisMediumMax, block, block); /* * If the init fails, blow away the other exported routines @@ -1398,7 +1398,7 @@ NdisAddDevice(drv, pdo) sc = device_get_softc(pdo->do_devext); - if (sc->ndis_iftype == PCMCIABus || sc->ndis_iftype == PCIBus) { + if (sc->ndis_iftype == PCMCIABus || sc->ndis_iftype == PCIBus) { error = bus_setup_intr(sc->ndis_dev, sc->ndis_irq, INTR_TYPE_NET | INTR_MPSAFE, NULL, ntoskrnl_intr, NULL, &sc->ndis_intrhand); @@ -1431,7 +1431,7 @@ NdisAddDevice(drv, pdo) * Stash pointers to the miniport block and miniport * characteristics info in the if_ndis softc so the * UNIX wrapper driver can get to them later. - */ + */ sc->ndis_block = block; sc->ndis_chars = IoGetDriverObjectExtension(drv, (void *)1); |
