From owner-svn-src-all@FreeBSD.ORG Sat Mar 7 07:26:23 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F40F10656C2; Sat, 7 Mar 2009 07:26:23 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF9F38FC14; Sat, 7 Mar 2009 07:26:22 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n277QMkA042218; Sat, 7 Mar 2009 07:26:22 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n277QMH2042213; Sat, 7 Mar 2009 07:26:22 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <200903070726.n277QMH2042213@svn.freebsd.org> From: Weongyo Jeong Date: Sat, 7 Mar 2009 07:26:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189488 - in head/sys: compat/ndis dev/if_ndis modules/if_ndis modules/ndis X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Mar 2009 07:26:23 -0000 Author: weongyo Date: Sat Mar 7 07:26:22 2009 New Revision: 189488 URL: http://svn.freebsd.org/changeset/base/189488 Log: 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 Modified: head/sys/compat/ndis/hal_var.h head/sys/compat/ndis/kern_ndis.c head/sys/compat/ndis/kern_windrv.c head/sys/compat/ndis/ndis_var.h head/sys/compat/ndis/ntoskrnl_var.h head/sys/compat/ndis/pe_var.h head/sys/compat/ndis/resource_var.h head/sys/compat/ndis/subr_hal.c head/sys/compat/ndis/subr_ndis.c head/sys/compat/ndis/subr_ntoskrnl.c head/sys/compat/ndis/subr_pe.c head/sys/compat/ndis/subr_usbd.c head/sys/compat/ndis/usbd_var.h head/sys/dev/if_ndis/if_ndis.c head/sys/dev/if_ndis/if_ndis_pccard.c head/sys/dev/if_ndis/if_ndis_pci.c head/sys/dev/if_ndis/if_ndis_usb.c head/sys/dev/if_ndis/if_ndisvar.h head/sys/modules/if_ndis/Makefile head/sys/modules/ndis/Makefile Modified: head/sys/compat/ndis/hal_var.h ============================================================================== --- head/sys/compat/ndis/hal_var.h Sat Mar 7 07:23:04 2009 (r189487) +++ head/sys/compat/ndis/hal_var.h Sat Mar 7 07:26:22 2009 (r189488) @@ -48,6 +48,7 @@ extern image_patch_table hal_functbl[]; __BEGIN_DECLS extern int hal_libinit(void); extern int hal_libfini(void); +extern struct mtx *hal_getdisplock(void); extern uint8_t KfAcquireSpinLock(kspin_lock *); extern void KfReleaseSpinLock(kspin_lock *, uint8_t); extern uint8_t KfRaiseIrql(uint8_t); Modified: head/sys/compat/ndis/kern_ndis.c ============================================================================== --- head/sys/compat/ndis/kern_ndis.c Sat Mar 7 07:23:04 2009 (r189487) +++ head/sys/compat/ndis/kern_ndis.c Sat Mar 7 07:26:22 2009 (r189488) @@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include +#include +#include #include #include @@ -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); Modified: head/sys/compat/ndis/kern_windrv.c ============================================================================== --- head/sys/compat/ndis/kern_windrv.c Sat Mar 7 07:23:04 2009 (r189487) +++ head/sys/compat/ndis/kern_windrv.c Sat Mar 7 07:26:22 2009 (r189488) @@ -56,8 +56,7 @@ __FBSDID("$FreeBSD$"); #include #endif -#include -#include +#include #include #include @@ -95,7 +94,7 @@ windrv_libinit(void) { STAILQ_INIT(&drvdb_head); mtx_init(&drvdb_mtx, "Windows driver DB lock", - "Windows internal lock", MTX_DEF); + "Windows internal lock", MTX_DEF); /* * PCI and pccard devices don't need to use IRPs to @@ -286,7 +285,7 @@ windrv_unload(mod, img, len) if (drv == NULL) return(ENOENT); - /* + /* * Destroy any custom extensions that may have been added. */ drv = r->windrv_object; @@ -341,7 +340,7 @@ windrv_load(mod, img, len, bustype, devl */ ptr = (uint32_t *)(img + 8); - if (*ptr == WINDRV_LOADED) + if (*ptr == WINDRV_LOADED) goto skipreloc; /* Perform text relocation */ @@ -390,7 +389,7 @@ skipreloc: free (new, M_DEVBUF); return (ENOMEM); } - + /* Allocate a driver extension structure too. */ drv->dro_driverext = malloc(sizeof(driver_extension), @@ -544,7 +543,7 @@ windrv_bus_attach(drv, name) new->windrv_devlist = NULL; new->windrv_regvals = NULL; - mtx_lock(&drvdb_mtx); + mtx_lock(&drvdb_mtx); STAILQ_INSERT_HEAD(&drvdb_head, new, link); mtx_unlock(&drvdb_mtx); @@ -727,41 +726,41 @@ static int windrv_wrap_stdcall(funcptr, static int windrv_wrap_fastcall(funcptr, funcptr *, int); static int windrv_wrap_regparm(funcptr, funcptr *); -extern void x86_fastcall_wrap(void); -extern void x86_fastcall_wrap_call(void); -extern void x86_fastcall_wrap_arg(void); -extern void x86_fastcall_wrap_end(void); +extern void x86_fastcall_wrap(void); +extern void x86_fastcall_wrap_call(void); +extern void x86_fastcall_wrap_arg(void); +extern void x86_fastcall_wrap_end(void); static int windrv_wrap_fastcall(func, wrap, argcnt) - funcptr func; - funcptr *wrap; + funcptr func; + funcptr *wrap; int8_t argcnt; { - funcptr p; - vm_offset_t *calladdr; + funcptr p; + vm_offset_t *calladdr; uint8_t *argaddr; - vm_offset_t wrapstart, wrapend, wrapcall, wraparg; + vm_offset_t wrapstart, wrapend, wrapcall, wraparg; - wrapstart = (vm_offset_t)&x86_fastcall_wrap; - wrapend = (vm_offset_t)&x86_fastcall_wrap_end; - wrapcall = (vm_offset_t)&x86_fastcall_wrap_call; - wraparg = (vm_offset_t)&x86_fastcall_wrap_arg; + wrapstart = (vm_offset_t)&x86_fastcall_wrap; + wrapend = (vm_offset_t)&x86_fastcall_wrap_end; + wrapcall = (vm_offset_t)&x86_fastcall_wrap_call; + wraparg = (vm_offset_t)&x86_fastcall_wrap_arg; - /* Allocate a new wrapper instance. */ + /* Allocate a new wrapper instance. */ - p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT); - if (p == NULL) - return(ENOMEM); + p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT); + if (p == NULL) + return(ENOMEM); - /* Copy over the code. */ + /* Copy over the code. */ bcopy((char *)wrapstart, p, (wrapend - wrapstart)); - /* Insert the function address into the new wrapper instance. */ + /* Insert the function address into the new wrapper instance. */ calladdr = (vm_offset_t *)((char *)p + ((wrapcall - wrapstart) + 1)); - *calladdr = (vm_offset_t)func; + *calladdr = (vm_offset_t)func; argcnt -= 2; if (argcnt < 1) @@ -770,96 +769,96 @@ windrv_wrap_fastcall(func, wrap, argcnt) argaddr = (u_int8_t *)((char *)p + ((wraparg - wrapstart) + 1)); *argaddr = argcnt * sizeof(uint32_t); - *wrap = p; + *wrap = p; - return(0); + return(0); } -extern void x86_stdcall_wrap(void); -extern void x86_stdcall_wrap_call(void); -extern void x86_stdcall_wrap_arg(void); -extern void x86_stdcall_wrap_end(void); +extern void x86_stdcall_wrap(void); +extern void x86_stdcall_wrap_call(void); +extern void x86_stdcall_wrap_arg(void); +extern void x86_stdcall_wrap_end(void); static int windrv_wrap_stdcall(func, wrap, argcnt) - funcptr func; - funcptr *wrap; + funcptr func; + funcptr *wrap; uint8_t argcnt; { - funcptr p; - vm_offset_t *calladdr; + funcptr p; + vm_offset_t *calladdr; uint8_t *argaddr; - vm_offset_t wrapstart, wrapend, wrapcall, wraparg; + vm_offset_t wrapstart, wrapend, wrapcall, wraparg; - wrapstart = (vm_offset_t)&x86_stdcall_wrap; - wrapend = (vm_offset_t)&x86_stdcall_wrap_end; - wrapcall = (vm_offset_t)&x86_stdcall_wrap_call; - wraparg = (vm_offset_t)&x86_stdcall_wrap_arg; + wrapstart = (vm_offset_t)&x86_stdcall_wrap; + wrapend = (vm_offset_t)&x86_stdcall_wrap_end; + wrapcall = (vm_offset_t)&x86_stdcall_wrap_call; + wraparg = (vm_offset_t)&x86_stdcall_wrap_arg; - /* Allocate a new wrapper instance. */ + /* Allocate a new wrapper instance. */ - p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT); - if (p == NULL) - return(ENOMEM); + p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT); + if (p == NULL) + return(ENOMEM); - /* Copy over the code. */ + /* Copy over the code. */ bcopy((char *)wrapstart, p, (wrapend - wrapstart)); - /* Insert the function address into the new wrapper instance. */ + /* Insert the function address into the new wrapper instance. */ calladdr = (vm_offset_t *)((char *)p + ((wrapcall - wrapstart) + 1)); - *calladdr = (vm_offset_t)func; + *calladdr = (vm_offset_t)func; argaddr = (u_int8_t *)((char *)p + ((wraparg - wrapstart) + 1)); *argaddr = argcnt * sizeof(uint32_t); - *wrap = p; + *wrap = p; - return(0); + return(0); } -extern void x86_regparm_wrap(void); -extern void x86_regparm_wrap_call(void); -extern void x86_regparm_wrap_end(void); +extern void x86_regparm_wrap(void); +extern void x86_regparm_wrap_call(void); +extern void x86_regparm_wrap_end(void); static int windrv_wrap_regparm(func, wrap) - funcptr func; - funcptr *wrap; + funcptr func; + funcptr *wrap; { - funcptr p; - vm_offset_t *calladdr; - vm_offset_t wrapstart, wrapend, wrapcall; + funcptr p; + vm_offset_t *calladdr; + vm_offset_t wrapstart, wrapend, wrapcall; - wrapstart = (vm_offset_t)&x86_regparm_wrap; - wrapend = (vm_offset_t)&x86_regparm_wrap_end; - wrapcall = (vm_offset_t)&x86_regparm_wrap_call; + wrapstart = (vm_offset_t)&x86_regparm_wrap; + wrapend = (vm_offset_t)&x86_regparm_wrap_end; + wrapcall = (vm_offset_t)&x86_regparm_wrap_call; - /* Allocate a new wrapper instance. */ + /* Allocate a new wrapper instance. */ - p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT); - if (p == NULL) - return(ENOMEM); + p = malloc((wrapend - wrapstart), M_DEVBUF, M_NOWAIT); + if (p == NULL) + return(ENOMEM); - /* Copy over the code. */ + /* Copy over the code. */ - bcopy(x86_regparm_wrap, p, (wrapend - wrapstart)); + bcopy(x86_regparm_wrap, p, (wrapend - wrapstart)); - /* Insert the function address into the new wrapper instance. */ + /* Insert the function address into the new wrapper instance. */ calladdr = (vm_offset_t *)((char *)p + ((wrapcall - wrapstart) + 1)); - *calladdr = (vm_offset_t)func; + *calladdr = (vm_offset_t)func; - *wrap = p; + *wrap = p; - return(0); + return(0); } int windrv_wrap(func, wrap, argcnt, ftype) - funcptr func; - funcptr *wrap; + funcptr func; + funcptr *wrap; int argcnt; int ftype; { Modified: head/sys/compat/ndis/ndis_var.h ============================================================================== --- head/sys/compat/ndis/ndis_var.h Sat Mar 7 07:23:04 2009 (r189487) +++ head/sys/compat/ndis/ndis_var.h Sat Mar 7 07:26:22 2009 (r189488) @@ -33,7 +33,7 @@ */ #ifndef _NDIS_VAR_H_ -#define _NDIS_VAR_H_ +#define _NDIS_VAR_H_ /* Forward declarations */ struct ndis_miniport_block; @@ -55,122 +55,122 @@ typedef uint8_t ndis_kirql; * NT status codes. */ -#define NDIS_STATUS_SUCCESS 0 -#define NDIS_STATUS_PENDING 0x00000103 -#define NDIS_STATUS_NOT_RECOGNIZED 0x00010001 -#define NDIS_STATUS_NOT_COPIED 0x00010002 -#define NDIS_STATUS_NOT_ACCEPTED 0x00010003 -#define NDIS_STATUS_CALL_ACTIVE 0x00010007 -#define NDIS_STATUS_ONLINE 0x40010003 -#define NDIS_STATUS_RESET_START 0x40010004 -#define NDIS_STATUS_RESET_END 0x40010005 -#define NDIS_STATUS_RING_STATUS 0x40010006 -#define NDIS_STATUS_CLOSED 0x40010007 -#define NDIS_STATUS_WAN_LINE_UP 0x40010008 -#define NDIS_STATUS_WAN_LINE_DOWN 0x40010009 -#define NDIS_STATUS_WAN_FRAGMENT 0x4001000A -#define NDIS_STATUS_MEDIA_CONNECT 0x4001000B -#define NDIS_STATUS_MEDIA_DISCONNECT 0x4001000C -#define NDIS_STATUS_HARDWARE_LINE_UP 0x4001000D -#define NDIS_STATUS_HARDWARE_LINE_DOWN 0x4001000E -#define NDIS_STATUS_INTERFACE_UP 0x4001000F -#define NDIS_STATUS_INTERFACE_DOWN 0x40010010 -#define NDIS_STATUS_MEDIA_BUSY 0x40010011 -#define NDIS_STATUS_MEDIA_SPECIFIC_INDICATION 0x40010012 -#define NDIS_STATUS_WW_INDICATION NDIS_STATUS_MEDIA_SPECIFIC_INDICATION -#define NDIS_STATUS_LINK_SPEED_CHANGE 0x40010013 -#define NDIS_STATUS_WAN_GET_STATS 0x40010014 -#define NDIS_STATUS_WAN_CO_FRAGMENT 0x40010015 -#define NDIS_STATUS_WAN_CO_LINKPARAMS 0x40010016 -#define NDIS_STATUS_NOT_RESETTABLE 0x80010001 -#define NDIS_STATUS_SOFT_ERRORS 0x80010003 -#define NDIS_STATUS_HARD_ERRORS 0x80010004 -#define NDIS_STATUS_BUFFER_OVERFLOW 0x80000005 -#define NDIS_STATUS_FAILURE 0xC0000001 -#define NDIS_STATUS_RESOURCES 0xC000009A -#define NDIS_STATUS_CLOSING 0xC0010002 -#define NDIS_STATUS_BAD_VERSION 0xC0010004 -#define NDIS_STATUS_BAD_CHARACTERISTICS 0xC0010005 -#define NDIS_STATUS_ADAPTER_NOT_FOUND 0xC0010006 -#define NDIS_STATUS_OPEN_FAILED 0xC0010007 -#define NDIS_STATUS_DEVICE_FAILED 0xC0010008 -#define NDIS_STATUS_MULTICAST_FULL 0xC0010009 -#define NDIS_STATUS_MULTICAST_EXISTS 0xC001000A -#define NDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B -#define NDIS_STATUS_REQUEST_ABORTED 0xC001000C -#define NDIS_STATUS_RESET_IN_PROGRESS 0xC001000D -#define NDIS_STATUS_CLOSING_INDICATING 0xC001000E -#define NDIS_STATUS_NOT_SUPPORTED 0xC00000BB -#define NDIS_STATUS_INVALID_PACKET 0xC001000F -#define NDIS_STATUS_OPEN_LIST_FULL 0xC0010010 -#define NDIS_STATUS_ADAPTER_NOT_READY 0xC0010011 -#define NDIS_STATUS_ADAPTER_NOT_OPEN 0xC0010012 -#define NDIS_STATUS_NOT_INDICATING 0xC0010013 -#define NDIS_STATUS_INVALID_LENGTH 0xC0010014 -#define NDIS_STATUS_INVALID_DATA 0xC0010015 -#define NDIS_STATUS_BUFFER_TOO_SHORT 0xC0010016 -#define NDIS_STATUS_INVALID_OID 0xC0010017 -#define NDIS_STATUS_ADAPTER_REMOVED 0xC0010018 -#define NDIS_STATUS_UNSUPPORTED_MEDIA 0xC0010019 -#define NDIS_STATUS_GROUP_ADDRESS_IN_USE 0xC001001A -#define NDIS_STATUS_FILE_NOT_FOUND 0xC001001B -#define NDIS_STATUS_ERROR_READING_FILE 0xC001001C -#define NDIS_STATUS_ALREADY_MAPPED 0xC001001D -#define NDIS_STATUS_RESOURCE_CONFLICT 0xC001001E -#define NDIS_STATUS_NO_CABLE 0xC001001F -#define NDIS_STATUS_INVALID_SAP 0xC0010020 -#define NDIS_STATUS_SAP_IN_USE 0xC0010021 -#define NDIS_STATUS_INVALID_ADDRESS 0xC0010022 -#define NDIS_STATUS_VC_NOT_ACTIVATED 0xC0010023 -#define NDIS_STATUS_DEST_OUT_OF_ORDER 0xC0010024 -#define NDIS_STATUS_VC_NOT_AVAILABLE 0xC0010025 -#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE 0xC0010026 -#define NDIS_STATUS_INCOMPATABLE_QOS 0xC0010027 -#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED 0xC0010028 -#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION 0xC0010029 -#define NDIS_STATUS_TOKEN_RING_OPEN_ERROR 0xC0011000 -#define NDIS_STATUS_INVALID_DEVICE_REQUEST 0xC0000010 -#define NDIS_STATUS_NETWORK_UNREACHABLE 0xC000023C +#define NDIS_STATUS_SUCCESS 0 +#define NDIS_STATUS_PENDING 0x00000103 +#define NDIS_STATUS_NOT_RECOGNIZED 0x00010001 +#define NDIS_STATUS_NOT_COPIED 0x00010002 +#define NDIS_STATUS_NOT_ACCEPTED 0x00010003 +#define NDIS_STATUS_CALL_ACTIVE 0x00010007 +#define NDIS_STATUS_ONLINE 0x40010003 +#define NDIS_STATUS_RESET_START 0x40010004 +#define NDIS_STATUS_RESET_END 0x40010005 +#define NDIS_STATUS_RING_STATUS 0x40010006 +#define NDIS_STATUS_CLOSED 0x40010007 +#define NDIS_STATUS_WAN_LINE_UP 0x40010008 +#define NDIS_STATUS_WAN_LINE_DOWN 0x40010009 +#define NDIS_STATUS_WAN_FRAGMENT 0x4001000A +#define NDIS_STATUS_MEDIA_CONNECT 0x4001000B +#define NDIS_STATUS_MEDIA_DISCONNECT 0x4001000C +#define NDIS_STATUS_HARDWARE_LINE_UP 0x4001000D +#define NDIS_STATUS_HARDWARE_LINE_DOWN 0x4001000E +#define NDIS_STATUS_INTERFACE_UP 0x4001000F +#define NDIS_STATUS_INTERFACE_DOWN 0x40010010 +#define NDIS_STATUS_MEDIA_BUSY 0x40010011 +#define NDIS_STATUS_MEDIA_SPECIFIC_INDICATION 0x40010012 +#define NDIS_STATUS_WW_INDICATION NDIS_STATUS_MEDIA_SPECIFIC_INDICATION +#define NDIS_STATUS_LINK_SPEED_CHANGE 0x40010013 +#define NDIS_STATUS_WAN_GET_STATS 0x40010014 +#define NDIS_STATUS_WAN_CO_FRAGMENT 0x40010015 +#define NDIS_STATUS_WAN_CO_LINKPARAMS 0x40010016 +#define NDIS_STATUS_NOT_RESETTABLE 0x80010001 +#define NDIS_STATUS_SOFT_ERRORS 0x80010003 +#define NDIS_STATUS_HARD_ERRORS 0x80010004 +#define NDIS_STATUS_BUFFER_OVERFLOW 0x80000005 +#define NDIS_STATUS_FAILURE 0xC0000001 +#define NDIS_STATUS_RESOURCES 0xC000009A +#define NDIS_STATUS_CLOSING 0xC0010002 +#define NDIS_STATUS_BAD_VERSION 0xC0010004 +#define NDIS_STATUS_BAD_CHARACTERISTICS 0xC0010005 +#define NDIS_STATUS_ADAPTER_NOT_FOUND 0xC0010006 +#define NDIS_STATUS_OPEN_FAILED 0xC0010007 +#define NDIS_STATUS_DEVICE_FAILED 0xC0010008 +#define NDIS_STATUS_MULTICAST_FULL 0xC0010009 +#define NDIS_STATUS_MULTICAST_EXISTS 0xC001000A +#define NDIS_STATUS_MULTICAST_NOT_FOUND 0xC001000B +#define NDIS_STATUS_REQUEST_ABORTED 0xC001000C +#define NDIS_STATUS_RESET_IN_PROGRESS 0xC001000D +#define NDIS_STATUS_CLOSING_INDICATING 0xC001000E +#define NDIS_STATUS_NOT_SUPPORTED 0xC00000BB +#define NDIS_STATUS_INVALID_PACKET 0xC001000F +#define NDIS_STATUS_OPEN_LIST_FULL 0xC0010010 +#define NDIS_STATUS_ADAPTER_NOT_READY 0xC0010011 +#define NDIS_STATUS_ADAPTER_NOT_OPEN 0xC0010012 +#define NDIS_STATUS_NOT_INDICATING 0xC0010013 +#define NDIS_STATUS_INVALID_LENGTH 0xC0010014 +#define NDIS_STATUS_INVALID_DATA 0xC0010015 +#define NDIS_STATUS_BUFFER_TOO_SHORT 0xC0010016 +#define NDIS_STATUS_INVALID_OID 0xC0010017 +#define NDIS_STATUS_ADAPTER_REMOVED 0xC0010018 +#define NDIS_STATUS_UNSUPPORTED_MEDIA 0xC0010019 +#define NDIS_STATUS_GROUP_ADDRESS_IN_USE 0xC001001A +#define NDIS_STATUS_FILE_NOT_FOUND 0xC001001B +#define NDIS_STATUS_ERROR_READING_FILE 0xC001001C +#define NDIS_STATUS_ALREADY_MAPPED 0xC001001D +#define NDIS_STATUS_RESOURCE_CONFLICT 0xC001001E +#define NDIS_STATUS_NO_CABLE 0xC001001F +#define NDIS_STATUS_INVALID_SAP 0xC0010020 +#define NDIS_STATUS_SAP_IN_USE 0xC0010021 +#define NDIS_STATUS_INVALID_ADDRESS 0xC0010022 +#define NDIS_STATUS_VC_NOT_ACTIVATED 0xC0010023 +#define NDIS_STATUS_DEST_OUT_OF_ORDER 0xC0010024 +#define NDIS_STATUS_VC_NOT_AVAILABLE 0xC0010025 +#define NDIS_STATUS_CELLRATE_NOT_AVAILABLE 0xC0010026 +#define NDIS_STATUS_INCOMPATABLE_QOS 0xC0010027 +#define NDIS_STATUS_AAL_PARAMS_UNSUPPORTED 0xC0010028 +#define NDIS_STATUS_NO_ROUTE_TO_DESTINATION 0xC0010029 +#define NDIS_STATUS_TOKEN_RING_OPEN_ERROR 0xC0011000 +#define NDIS_STATUS_INVALID_DEVICE_REQUEST 0xC0000010 +#define NDIS_STATUS_NETWORK_UNREACHABLE 0xC000023C /* * NDIS event codes. They are usually reported to NdisWriteErrorLogEntry(). */ -#define EVENT_NDIS_RESOURCE_CONFLICT 0xC0001388 -#define EVENT_NDIS_OUT_OF_RESOURCE 0xC0001389 -#define EVENT_NDIS_HARDWARE_FAILURE 0xC000138A -#define EVENT_NDIS_ADAPTER_NOT_FOUND 0xC000138B -#define EVENT_NDIS_INTERRUPT_CONNECT 0xC000138C -#define EVENT_NDIS_DRIVER_FAILURE 0xC000138D -#define EVENT_NDIS_BAD_VERSION 0xC000138E -#define EVENT_NDIS_TIMEOUT 0x8000138F -#define EVENT_NDIS_NETWORK_ADDRESS 0xC0001390 -#define EVENT_NDIS_UNSUPPORTED_CONFIGURATION 0xC0001391 -#define EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER 0xC0001392 -#define EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER 0xC0001393 -#define EVENT_NDIS_BAD_IO_BASE_ADDRESS 0xC0001394 -#define EVENT_NDIS_RECEIVE_SPACE_SMALL 0x40001395 -#define EVENT_NDIS_ADAPTER_DISABLED 0x80001396 -#define EVENT_NDIS_IO_PORT_CONFLICT 0x80001397 -#define EVENT_NDIS_PORT_OR_DMA_CONFLICT 0x80001398 -#define EVENT_NDIS_MEMORY_CONFLICT 0x80001399 -#define EVENT_NDIS_INTERRUPT_CONFLICT 0x8000139A -#define EVENT_NDIS_DMA_CONFLICT 0x8000139B -#define EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR 0xC000139C -#define EVENT_NDIS_MAXRECEIVES_ERROR 0x8000139D -#define EVENT_NDIS_MAXTRANSMITS_ERROR 0x8000139E -#define EVENT_NDIS_MAXFRAMESIZE_ERROR 0x8000139F -#define EVENT_NDIS_MAXINTERNALBUFS_ERROR 0x800013A0 -#define EVENT_NDIS_MAXMULTICAST_ERROR 0x800013A1 -#define EVENT_NDIS_PRODUCTID_ERROR 0x800013A2 -#define EVENT_NDIS_LOBE_FAILUE_ERROR 0x800013A3 -#define EVENT_NDIS_SIGNAL_LOSS_ERROR 0x800013A4 -#define EVENT_NDIS_REMOVE_RECEIVED_ERROR 0x800013A5 -#define EVENT_NDIS_TOKEN_RING_CORRECTION 0x400013A6 -#define EVENT_NDIS_ADAPTER_CHECK_ERROR 0xC00013A7 -#define EVENT_NDIS_RESET_FAILURE_ERROR 0x800013A8 -#define EVENT_NDIS_CABLE_DISCONNECTED_ERROR 0x800013A9 -#define EVENT_NDIS_RESET_FAILURE_CORRECTION 0x800013AA +#define EVENT_NDIS_RESOURCE_CONFLICT 0xC0001388 +#define EVENT_NDIS_OUT_OF_RESOURCE 0xC0001389 +#define EVENT_NDIS_HARDWARE_FAILURE 0xC000138A +#define EVENT_NDIS_ADAPTER_NOT_FOUND 0xC000138B +#define EVENT_NDIS_INTERRUPT_CONNECT 0xC000138C +#define EVENT_NDIS_DRIVER_FAILURE 0xC000138D +#define EVENT_NDIS_BAD_VERSION 0xC000138E +#define EVENT_NDIS_TIMEOUT 0x8000138F +#define EVENT_NDIS_NETWORK_ADDRESS 0xC0001390 +#define EVENT_NDIS_UNSUPPORTED_CONFIGURATION 0xC0001391 +#define EVENT_NDIS_INVALID_VALUE_FROM_ADAPTER 0xC0001392 +#define EVENT_NDIS_MISSING_CONFIGURATION_PARAMETER 0xC0001393 +#define EVENT_NDIS_BAD_IO_BASE_ADDRESS 0xC0001394 +#define EVENT_NDIS_RECEIVE_SPACE_SMALL 0x40001395 +#define EVENT_NDIS_ADAPTER_DISABLED 0x80001396 +#define EVENT_NDIS_IO_PORT_CONFLICT 0x80001397 +#define EVENT_NDIS_PORT_OR_DMA_CONFLICT 0x80001398 +#define EVENT_NDIS_MEMORY_CONFLICT 0x80001399 +#define EVENT_NDIS_INTERRUPT_CONFLICT 0x8000139A +#define EVENT_NDIS_DMA_CONFLICT 0x8000139B +#define EVENT_NDIS_INVALID_DOWNLOAD_FILE_ERROR 0xC000139C +#define EVENT_NDIS_MAXRECEIVES_ERROR 0x8000139D +#define EVENT_NDIS_MAXTRANSMITS_ERROR 0x8000139E +#define EVENT_NDIS_MAXFRAMESIZE_ERROR 0x8000139F +#define EVENT_NDIS_MAXINTERNALBUFS_ERROR 0x800013A0 +#define EVENT_NDIS_MAXMULTICAST_ERROR 0x800013A1 +#define EVENT_NDIS_PRODUCTID_ERROR 0x800013A2 +#define EVENT_NDIS_LOBE_FAILUE_ERROR 0x800013A3 +#define EVENT_NDIS_SIGNAL_LOSS_ERROR 0x800013A4 +#define EVENT_NDIS_REMOVE_RECEIVED_ERROR 0x800013A5 +#define EVENT_NDIS_TOKEN_RING_CORRECTION 0x400013A6 +#define EVENT_NDIS_ADAPTER_CHECK_ERROR 0xC00013A7 +#define EVENT_NDIS_RESET_FAILURE_ERROR 0x800013A8 +#define EVENT_NDIS_CABLE_DISCONNECTED_ERROR 0x800013A9 +#define EVENT_NDIS_RESET_FAILURE_CORRECTION 0x800013AA /* * NDIS OIDs used by the queryinfo/setinfo routines. @@ -181,178 +181,178 @@ typedef uint8_t ndis_kirql; */ /* Required OIDs */ -#define OID_GEN_SUPPORTED_LIST 0x00010101 -#define OID_GEN_HARDWARE_STATUS 0x00010102 -#define OID_GEN_MEDIA_SUPPORTED 0x00010103 -#define OID_GEN_MEDIA_IN_USE 0x00010104 -#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 -#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 -#define OID_GEN_LINK_SPEED 0x00010107 -#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 -#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 -#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A -#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B -#define OID_GEN_VENDOR_ID 0x0001010C -#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D -#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E -#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F -#define OID_GEN_DRIVER_VERSION 0x00010110 -#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 -#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 -#define OID_GEN_MAC_OPTIONS 0x00010113 -#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 -#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 -#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116 -#define OID_GEN_SUPPORTED_GUIDS 0x00010117 -#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118 /* Set only */ -#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119 /* Set only */ -#define OID_GEN_MACHINE_NAME 0x0001021A -#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B /* Set only */ -#define OID_GEN_VLAN_ID 0x0001021C +#define OID_GEN_SUPPORTED_LIST 0x00010101 +#define OID_GEN_HARDWARE_STATUS 0x00010102 +#define OID_GEN_MEDIA_SUPPORTED 0x00010103 +#define OID_GEN_MEDIA_IN_USE 0x00010104 +#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 +#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 +#define OID_GEN_LINK_SPEED 0x00010107 +#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 +#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 +#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A +#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B +#define OID_GEN_VENDOR_ID 0x0001010C +#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D +#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E +#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F +#define OID_GEN_DRIVER_VERSION 0x00010110 +#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 +#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 +#define OID_GEN_MAC_OPTIONS 0x00010113 +#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 +#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 +#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116 +#define OID_GEN_SUPPORTED_GUIDS 0x00010117 +#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118 /* Set only */ +#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119 /* Set only */ +#define OID_GEN_MACHINE_NAME 0x0001021A +#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B /* Set only */ +#define OID_GEN_VLAN_ID 0x0001021C /* Optional OIDs. */ -#define OID_GEN_MEDIA_CAPABILITIES 0x00010201 -#define OID_GEN_PHYSICAL_MEDIUM 0x00010202 +#define OID_GEN_MEDIA_CAPABILITIES 0x00010201 +#define OID_GEN_PHYSICAL_MEDIUM 0x00010202 /* Required statistics OIDs. */ -#define OID_GEN_XMIT_OK 0x00020101 -#define OID_GEN_RCV_OK 0x00020102 -#define OID_GEN_XMIT_ERROR 0x00020103 -#define OID_GEN_RCV_ERROR 0x00020104 -#define OID_GEN_RCV_NO_BUFFER 0x00020105 +#define OID_GEN_XMIT_OK 0x00020101 +#define OID_GEN_RCV_OK 0x00020102 +#define OID_GEN_XMIT_ERROR 0x00020103 +#define OID_GEN_RCV_ERROR 0x00020104 +#define OID_GEN_RCV_NO_BUFFER 0x00020105 /* Optional OID statistics */ -#define OID_GEN_DIRECTED_BYTES_XMIT 0x00020201 -#define OID_GEN_DIRECTED_FRAMES_XMIT 0x00020202 -#define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203 -#define OID_GEN_MULTICAST_FRAMES_XMIT 0x00020204 -#define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205 -#define OID_GEN_BROADCAST_FRAMES_XMIT 0x00020206 -#define OID_GEN_DIRECTED_BYTES_RCV 0x00020207 -#define OID_GEN_DIRECTED_FRAMES_RCV 0x00020208 -#define OID_GEN_MULTICAST_BYTES_RCV 0x00020209 -#define OID_GEN_MULTICAST_FRAMES_RCV 0x0002020A -#define OID_GEN_BROADCAST_BYTES_RCV 0x0002020B -#define OID_GEN_BROADCAST_FRAMES_RCV 0x0002020C -#define OID_GEN_RCV_CRC_ERROR 0x0002020D -#define OID_GEN_TRANSMIT_QUEUE_LENGTH 0x0002020E -#define OID_GEN_GET_TIME_CAPS 0x0002020F -#define OID_GEN_GET_NETCARD_TIME 0x00020210 -#define OID_GEN_NETCARD_LOAD 0x00020211 -#define OID_GEN_DEVICE_PROFILE 0x00020212 +#define OID_GEN_DIRECTED_BYTES_XMIT 0x00020201 +#define OID_GEN_DIRECTED_FRAMES_XMIT 0x00020202 +#define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203 +#define OID_GEN_MULTICAST_FRAMES_XMIT 0x00020204 +#define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205 +#define OID_GEN_BROADCAST_FRAMES_XMIT 0x00020206 +#define OID_GEN_DIRECTED_BYTES_RCV 0x00020207 +#define OID_GEN_DIRECTED_FRAMES_RCV 0x00020208 +#define OID_GEN_MULTICAST_BYTES_RCV 0x00020209 +#define OID_GEN_MULTICAST_FRAMES_RCV 0x0002020A +#define OID_GEN_BROADCAST_BYTES_RCV 0x0002020B +#define OID_GEN_BROADCAST_FRAMES_RCV 0x0002020C +#define OID_GEN_RCV_CRC_ERROR 0x0002020D +#define OID_GEN_TRANSMIT_QUEUE_LENGTH 0x0002020E +#define OID_GEN_GET_TIME_CAPS 0x0002020F +#define OID_GEN_GET_NETCARD_TIME 0x00020210 +#define OID_GEN_NETCARD_LOAD 0x00020211 +#define OID_GEN_DEVICE_PROFILE 0x00020212 /* 802.3 (ethernet) OIDs */ -#define OID_802_3_PERMANENT_ADDRESS 0x01010101 -#define OID_802_3_CURRENT_ADDRESS 0x01010102 -#define OID_802_3_MULTICAST_LIST 0x01010103 -#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 -#define OID_802_3_MAC_OPTIONS 0x01010105 -#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001 -#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 -#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 -#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 -#define OID_802_3_XMIT_DEFERRED 0x01020201 -#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 -#define OID_802_3_RCV_OVERRUN 0x01020203 -#define OID_802_3_XMIT_UNDERRUN 0x01020204 -#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 -#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 -#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 +#define OID_802_3_PERMANENT_ADDRESS 0x01010101 +#define OID_802_3_CURRENT_ADDRESS 0x01010102 +#define OID_802_3_MULTICAST_LIST 0x01010103 +#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 +#define OID_802_3_MAC_OPTIONS 0x01010105 +#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001 +#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 +#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 +#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 +#define OID_802_3_XMIT_DEFERRED 0x01020201 +#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 +#define OID_802_3_RCV_OVERRUN 0x01020203 +#define OID_802_3_XMIT_UNDERRUN 0x01020204 +#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 +#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 +#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 /* PnP and power management OIDs */ -#define OID_PNP_CAPABILITIES 0xFD010100 -#define OID_PNP_SET_POWER 0xFD010101 -#define OID_PNP_QUERY_POWER 0xFD010102 -#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 -#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 -#define OID_PNP_WAKE_UP_PATTERN_LIST 0xFD010105 -#define OID_PNP_ENABLE_WAKE_UP 0xFD010106 +#define OID_PNP_CAPABILITIES 0xFD010100 +#define OID_PNP_SET_POWER 0xFD010101 +#define OID_PNP_QUERY_POWER 0xFD010102 +#define OID_PNP_ADD_WAKE_UP_PATTERN 0xFD010103 +#define OID_PNP_REMOVE_WAKE_UP_PATTERN 0xFD010104 +#define OID_PNP_WAKE_UP_PATTERN_LIST 0xFD010105 +#define OID_PNP_ENABLE_WAKE_UP 0xFD010106 /* * These are the possible power states for * OID_PNP_SET_POWER and OID_PNP_QUERY_POWER. */ -#define NDIS_POWERSTATE_UNSPEC 0 -#define NDIS_POWERSTATE_D0 1 -#define NDIS_POWERSTATE_D1 2 -#define NDIS_POWERSTATE_D2 3 -#define NDIS_POWERSTATE_D3 4 +#define NDIS_POWERSTATE_UNSPEC 0 +#define NDIS_POWERSTATE_D0 1 +#define NDIS_POWERSTATE_D1 2 +#define NDIS_POWERSTATE_D2 3 +#define NDIS_POWERSTATE_D3 4 /* * These are used with the MiniportPnpEventNotify() method. */ -#define NDIS_POWERPROFILE_BATTERY 0 -#define NDIS_POWERPROFILE_ACONLINE 1 +#define NDIS_POWERPROFILE_BATTERY 0 +#define NDIS_POWERPROFILE_ACONLINE 1 -#define NDIS_PNP_EVENT_QUERY_REMOVED 0 -#define NDIS_PNP_EVENT_REMOVED 1 -#define NDIS_PNP_EVENT_SURPRISE_REMOVED 2 -#define NDIS_PNP_EVENT_QUERY_STOPPED 3 -#define NDIS_PNP_EVENT_STOPPED 4 -#define NDIS_PNP_EVENT_PROFILECHANGED 5 +#define NDIS_PNP_EVENT_QUERY_REMOVED 0 +#define NDIS_PNP_EVENT_REMOVED 1 +#define NDIS_PNP_EVENT_SURPRISE_REMOVED 2 +#define NDIS_PNP_EVENT_QUERY_STOPPED 3 +#define NDIS_PNP_EVENT_STOPPED 4 +#define NDIS_PNP_EVENT_PROFILECHANGED 5 /* PnP/PM Statistics (Optional). */ -#define OID_PNP_WAKE_UP_OK 0xFD020200 -#define OID_PNP_WAKE_UP_ERROR 0xFD020201 +#define OID_PNP_WAKE_UP_OK 0xFD020200 +#define OID_PNP_WAKE_UP_ERROR 0xFD020201 /* The following bits are defined for OID_PNP_ENABLE_WAKE_UP */ -#define NDIS_PNP_WAKE_UP_MAGIC_PACKET 0x00000001 -#define NDIS_PNP_WAKE_UP_PATTERN_MATCH 0x00000002 -#define NDIS_PNP_WAKE_UP_LINK_CHANGE 0x00000004 +#define NDIS_PNP_WAKE_UP_MAGIC_PACKET 0x00000001 +#define NDIS_PNP_WAKE_UP_PATTERN_MATCH 0x00000002 +#define NDIS_PNP_WAKE_UP_LINK_CHANGE 0x00000004 /* 802.11 OIDs */ -#define OID_802_11_BSSID 0x0D010101 -#define OID_802_11_SSID 0x0D010102 -#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0D010203 -#define OID_802_11_NETWORK_TYPE_IN_USE 0x0D010204 -#define OID_802_11_TX_POWER_LEVEL 0x0D010205 -#define OID_802_11_RSSI 0x0D010206 -#define OID_802_11_RSSI_TRIGGER 0x0D010207 -#define OID_802_11_INFRASTRUCTURE_MODE 0x0D010108 -#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0D010209 -#define OID_802_11_RTS_THRESHOLD 0x0D01020A -#define OID_802_11_NUMBER_OF_ANTENNAS 0x0D01020B -#define OID_802_11_RX_ANTENNA_SELECTED 0x0D01020C -#define OID_802_11_TX_ANTENNA_SELECTED 0x0D01020D -#define OID_802_11_SUPPORTED_RATES 0x0D01020E -#define OID_802_11_DESIRED_RATES 0x0D010210 -#define OID_802_11_CONFIGURATION 0x0D010211 -#define OID_802_11_STATISTICS 0x0D020212 -#define OID_802_11_ADD_WEP 0x0D010113 -#define OID_802_11_REMOVE_WEP 0x0D010114 -#define OID_802_11_DISASSOCIATE 0x0D010115 -#define OID_802_11_POWER_MODE 0x0D010216 -#define OID_802_11_BSSID_LIST 0x0D010217 -#define OID_802_11_AUTHENTICATION_MODE 0x0D010118 -#define OID_802_11_PRIVACY_FILTER 0x0D010119 -#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A -#define OID_802_11_WEP_STATUS 0x0D01011B -#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS -#define OID_802_11_RELOAD_DEFAULTS 0x0D01011C -#define OID_802_11_ADD_KEY 0x0D01011D -#define OID_802_11_REMOVE_KEY 0x0D01011E -#define OID_802_11_ASSOCIATION_INFORMATION 0x0D01011F -#define OID_802_11_TEST 0x0D010120 -#define OID_802_11_CAPABILITY 0x0D010122 -#define OID_802_11_PMKID 0x0D010123 +#define OID_802_11_BSSID 0x0D010101 +#define OID_802_11_SSID 0x0D010102 +#define OID_802_11_NETWORK_TYPES_SUPPORTED 0x0D010203 +#define OID_802_11_NETWORK_TYPE_IN_USE 0x0D010204 +#define OID_802_11_TX_POWER_LEVEL 0x0D010205 +#define OID_802_11_RSSI 0x0D010206 +#define OID_802_11_RSSI_TRIGGER 0x0D010207 +#define OID_802_11_INFRASTRUCTURE_MODE 0x0D010108 +#define OID_802_11_FRAGMENTATION_THRESHOLD 0x0D010209 +#define OID_802_11_RTS_THRESHOLD 0x0D01020A +#define OID_802_11_NUMBER_OF_ANTENNAS 0x0D01020B +#define OID_802_11_RX_ANTENNA_SELECTED 0x0D01020C +#define OID_802_11_TX_ANTENNA_SELECTED 0x0D01020D +#define OID_802_11_SUPPORTED_RATES 0x0D01020E +#define OID_802_11_DESIRED_RATES 0x0D010210 +#define OID_802_11_CONFIGURATION 0x0D010211 +#define OID_802_11_STATISTICS 0x0D020212 +#define OID_802_11_ADD_WEP 0x0D010113 +#define OID_802_11_REMOVE_WEP 0x0D010114 +#define OID_802_11_DISASSOCIATE 0x0D010115 +#define OID_802_11_POWER_MODE 0x0D010216 +#define OID_802_11_BSSID_LIST 0x0D010217 +#define OID_802_11_AUTHENTICATION_MODE 0x0D010118 +#define OID_802_11_PRIVACY_FILTER 0x0D010119 +#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A +#define OID_802_11_WEP_STATUS 0x0D01011B +#define OID_802_11_ENCRYPTION_STATUS OID_802_11_WEP_STATUS +#define OID_802_11_RELOAD_DEFAULTS 0x0D01011C +#define OID_802_11_ADD_KEY 0x0D01011D +#define OID_802_11_REMOVE_KEY 0x0D01011E +#define OID_802_11_ASSOCIATION_INFORMATION 0x0D01011F +#define OID_802_11_TEST 0x0D010120 +#define OID_802_11_CAPABILITY 0x0D010122 +#define OID_802_11_PMKID 0x0D010123 /* structures/definitions for 802.11 */ -#define NDIS_80211_NETTYPE_11FH 0x00000000 -#define NDIS_80211_NETTYPE_11DS 0x00000001 -#define NDIS_80211_NETTYPE_11OFDM5 0x00000002 -#define NDIS_80211_NETTYPE_11OFDM24 0x00000003 -#define NDIS_80211_NETTYPE_AUTO 0x00000004 +#define NDIS_80211_NETTYPE_11FH 0x00000000 +#define NDIS_80211_NETTYPE_11DS 0x00000001 +#define NDIS_80211_NETTYPE_11OFDM5 0x00000002 +#define NDIS_80211_NETTYPE_11OFDM24 0x00000003 +#define NDIS_80211_NETTYPE_AUTO 0x00000004 struct ndis_80211_nettype_list { uint32_t ntl_items; uint32_t ntl_type[1]; }; -#define NDIS_80211_POWERMODE_CAM 0x00000000 -#define NDIS_80211_POWERMODE_MAX_PSP 0x00000001 -#define NDIS_80211_POWERMODE_FAST_PSP 0x00000002 +#define NDIS_80211_POWERMODE_CAM 0x00000000 +#define NDIS_80211_POWERMODE_MAX_PSP 0x00000001 +#define NDIS_80211_POWERMODE_FAST_PSP 0x00000002 typedef uint32_t ndis_80211_power; /* Power in milliwatts */ typedef uint32_t ndis_80211_rssi; /* Signal strength in dBm */ @@ -405,21 +405,21 @@ struct ndis_80211_wep { typedef struct ndis_80211_wep ndis_80211_wep; -#define NDIS_80211_WEPKEY_TX 0x80000000 -#define NDIS_80211_WEPKEY_PERCLIENT 0x40000000 +#define NDIS_80211_WEPKEY_TX 0x80000000 +#define NDIS_80211_WEPKEY_PERCLIENT 0x40000000 -#define NDIS_80211_NET_INFRA_IBSS 0x00000000 -#define NDIS_80211_NET_INFRA_BSS 0x00000001 -#define NDIS_80211_NET_INFRA_AUTO 0x00000002 - -#define NDIS_80211_AUTHMODE_OPEN 0x00000000 -#define NDIS_80211_AUTHMODE_SHARED 0x00000001 -#define NDIS_80211_AUTHMODE_AUTO 0x00000002 -#define NDIS_80211_AUTHMODE_WPA 0x00000003 -#define NDIS_80211_AUTHMODE_WPAPSK 0x00000004 -#define NDIS_80211_AUTHMODE_WPANONE 0x00000005 -#define NDIS_80211_AUTHMODE_WPA2 0x00000006 -#define NDIS_80211_AUTHMODE_WPA2PSK 0x00000007 +#define NDIS_80211_NET_INFRA_IBSS 0x00000000 +#define NDIS_80211_NET_INFRA_BSS 0x00000001 +#define NDIS_80211_NET_INFRA_AUTO 0x00000002 + +#define NDIS_80211_AUTHMODE_OPEN 0x00000000 +#define NDIS_80211_AUTHMODE_SHARED 0x00000001 +#define NDIS_80211_AUTHMODE_AUTO 0x00000002 +#define NDIS_80211_AUTHMODE_WPA 0x00000003 +#define NDIS_80211_AUTHMODE_WPAPSK 0x00000004 +#define NDIS_80211_AUTHMODE_WPANONE 0x00000005 +#define NDIS_80211_AUTHMODE_WPA2 0x00000006 +#define NDIS_80211_AUTHMODE_WPA2PSK 0x00000007 typedef uint8_t ndis_80211_rates[8]; typedef uint8_t ndis_80211_rates_ex[16]; @@ -494,26 +494,26 @@ typedef uint32_t ndis_80211_fragthresh; typedef uint32_t ndis_80211_rtsthresh; typedef uint32_t ndis_80211_antenna; -#define NDIS_80211_PRIVFILT_ACCEPTALL 0x00000000 -#define NDIS_80211_PRIVFILT_8021XWEP 0x00000001 +#define NDIS_80211_PRIVFILT_ACCEPTALL 0x00000000 +#define NDIS_80211_PRIVFILT_8021XWEP 0x00000001 -#define NDIS_80211_WEPSTAT_ENABLED 0x00000000 -#define NDIS_80211_WEPSTAT_ENC1ENABLED NDIS_80211_WEPSTAT_ENABLED -#define NDIS_80211_WEPSTAT_DISABLED 0x00000001 -#define NDIS_80211_WEPSTAT_ENCDISABLED NDIS_80211_WEPSTAT_DISABLED -#define NDIS_80211_WEPSTAT_KEYABSENT 0x00000002 -#define NDIS_80211_WEPSTAT_ENC1KEYABSENT NDIS_80211_WEPSTAT_KEYABSENT -#define NDIS_80211_WEPSTAT_NOTSUPPORTED 0x00000003 -#define NDIS_80211_WEPSTAT_ENCNOTSUPPORTED NDIS_80211_WEPSTAT_NOTSUPPORTED -#define NDIS_80211_WEPSTAT_ENC2ENABLED 0x00000004 -#define NDIS_80211_WEPSTAT_ENC2KEYABSENT 0x00000005 -#define NDIS_80211_WEPSTAT_ENC3ENABLED 0x00000006 -#define NDIS_80211_WEPSTAT_ENC3KEYABSENT 0x00000007 +#define NDIS_80211_WEPSTAT_ENABLED 0x00000000 +#define NDIS_80211_WEPSTAT_ENC1ENABLED NDIS_80211_WEPSTAT_ENABLED +#define NDIS_80211_WEPSTAT_DISABLED 0x00000001 +#define NDIS_80211_WEPSTAT_ENCDISABLED NDIS_80211_WEPSTAT_DISABLED +#define NDIS_80211_WEPSTAT_KEYABSENT 0x00000002 +#define NDIS_80211_WEPSTAT_ENC1KEYABSENT NDIS_80211_WEPSTAT_KEYABSENT +#define NDIS_80211_WEPSTAT_NOTSUPPORTED 0x00000003 +#define NDIS_80211_WEPSTAT_ENCNOTSUPPORTED NDIS_80211_WEPSTAT_NOTSUPPORTED +#define NDIS_80211_WEPSTAT_ENC2ENABLED 0x00000004 +#define NDIS_80211_WEPSTAT_ENC2KEYABSENT 0x00000005 +#define NDIS_80211_WEPSTAT_ENC3ENABLED 0x00000006 +#define NDIS_80211_WEPSTAT_ENC3KEYABSENT 0x00000007 -#define NDIS_80211_RELOADDEFAULT_WEP 0x00000000 +#define NDIS_80211_RELOADDEFAULT_WEP 0x00000000 -#define NDIS_80211_STATUSTYPE_AUTH 0x00000000 -#define NDIS_80211_STATUSTYPE_PMKIDLIST 0x00000001 +#define NDIS_80211_STATUSTYPE_AUTH 0x00000000 +#define NDIS_80211_STATUSTYPE_PMKIDLIST 0x00000001 struct ndis_80211_status_indication { uint32_t nsi_type; @@ -521,10 +521,10 @@ struct ndis_80211_status_indication { typedef struct ndis_80211_status_indication ndis_80211_status_indication; -#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01 -#define NDIS_802_11_AUTH_REQUEST_KEYUPDATE 0x02 -#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06 -#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E +#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01 +#define NDIS_802_11_AUTH_REQUEST_KEYUPDATE 0x02 +#define NDIS_802_11_AUTH_REQUEST_PAIRWISE_ERROR 0x06 +#define NDIS_802_11_AUTH_REQUEST_GROUP_ERROR 0x0E struct ndis_80211_auth_request { uint32_t nar_len; @@ -554,13 +554,13 @@ struct ndis_80211_remove_key { typedef struct ndis_80211_remove_key ndis_80211_remove_key; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***