From owner-p4-projects@FreeBSD.ORG Tue Dec 23 04:47:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABCF71065678; Tue, 23 Dec 2008 04:47:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 578B61065675 for ; Tue, 23 Dec 2008 04:47:29 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 468108FC1C for ; Tue, 23 Dec 2008 04:47:29 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBN4lT2K011161 for ; Tue, 23 Dec 2008 04:47:29 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBN4lTtq011159 for perforce@freebsd.org; Tue, 23 Dec 2008 04:47:29 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 23 Dec 2008 04:47:29 GMT Message-Id: <200812230447.mBN4lTtq011159@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Dec 2008 04:47:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=155149 Change 155149 by weongyo@weongyo_ws on 2008/12/23 04:46:38 style(9) Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#8 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#8 (text+ko) ==== @@ -35,27 +35,27 @@ #ifndef _USBD_VAR_H_ #define _USBD_VAR_H_ -#define IOCTL_INTERNAL_USB_SUBMIT_URB 0x00220003 +#define IOCTL_INTERNAL_USB_SUBMIT_URB 0x00220003 -#define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 -#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER 0x0009 -#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE 0x000B -#define URB_FUNCTION_VENDOR_DEVICE 0x0017 -#define URB_FUNCTION_VENDOR_INTERFACE 0x0018 -#define URB_FUNCTION_VENDOR_ENDPOINT 0x0019 -#define URB_FUNCTION_CLASS_DEVICE 0x001A -#define URB_FUNCTION_CLASS_INTERFACE 0x001B -#define URB_FUNCTION_CLASS_ENDPOINT 0x001C -#define URB_FUNCTION_CLASS_OTHER 0x001F -#define URB_FUNCTION_VENDOR_OTHER 0x0020 +#define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 +#define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER 0x0009 +#define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE 0x000B +#define URB_FUNCTION_VENDOR_DEVICE 0x0017 +#define URB_FUNCTION_VENDOR_INTERFACE 0x0018 +#define URB_FUNCTION_VENDOR_ENDPOINT 0x0019 +#define URB_FUNCTION_CLASS_DEVICE 0x001A +#define URB_FUNCTION_CLASS_INTERFACE 0x001B +#define URB_FUNCTION_CLASS_ENDPOINT 0x001C +#define URB_FUNCTION_CLASS_OTHER 0x001F +#define URB_FUNCTION_VENDOR_OTHER 0x0020 -#define USBD_STATUS_SUCCESS 0x00000000 -#define USBD_STATUS_CANCELED 0x00010000 -#define USBD_STATUS_PENDING 0x40000000 -#define USBD_STATUS_NO_MEMORY 0x80000100 -#define USBD_STATUS_REQUEST_FAILED 0x80000500 -#define USBD_STATUS_INVALID_PIPE_HANDLE 0x80000600 -#define USBD_STATUS_ERROR_SHORT_TRANSFER 0x80000900 +#define USBD_STATUS_SUCCESS 0x00000000 +#define USBD_STATUS_CANCELED 0x00010000 +#define USBD_STATUS_PENDING 0x40000000 +#define USBD_STATUS_NO_MEMORY 0x80000100 +#define USBD_STATUS_REQUEST_FAILED 0x80000500 +#define USBD_STATUS_INVALID_PIPE_HANDLE 0x80000600 +#define USBD_STATUS_ERROR_SHORT_TRANSFER 0x80000900 #define USBD_STATUS_CRC 0xC0000001 #define USBD_STATUS_BTSTUFF 0xC0000002 #define USBD_STATUS_DATA_TOGGLE_MISMATCH 0xC0000003 @@ -74,9 +74,9 @@ #define USBD_STATUS_XACT_ERROR 0xC0000011 #define USBD_STATUS_BABBLE_DETECTED 0xC0000012 #define USBD_STATUS_DATA_BUFFER_ERROR 0xC0000013 -#define USBD_STATUS_NOT_SUPPORTED 0xC0000E00 -#define USBD_STATUS_TIMEOUT 0xC0006000 -#define USBD_STATUS_DEVICE_GONE 0xC0007000 +#define USBD_STATUS_NOT_SUPPORTED 0xC0000E00 +#define USBD_STATUS_TIMEOUT 0xC0006000 +#define USBD_STATUS_DEVICE_GONE 0xC0007000 struct usbd_urb_header { uint16_t uuh_len; @@ -95,26 +95,26 @@ struct usbd_pipe_information { uint16_t upi_maxpktsize; - uint8_t upi_epaddr; - uint8_t upi_interval; - enum usbd_pipe_type upi_type; - usb_endpoint_descriptor_t *upi_handle; - uint32_t upi_maxtxsize; -#define USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE PAGE_SIZE - uint32_t upi_flags; + uint8_t upi_epaddr; + uint8_t upi_interval; + enum usbd_pipe_type upi_type; + usb_endpoint_descriptor_t *upi_handle; + uint32_t upi_maxtxsize; +#define USBD_DEFAULT_MAXIMUM_TRANSFER_SIZE PAGE_SIZE + uint32_t upi_flags; }; struct usbd_interface_information { - uint16_t uii_len; - uint8_t uii_intfnum; - uint8_t uii_altset; - uint8_t uii_intfclass; - uint8_t uii_intfsubclass; - uint8_t uii_intfproto; - uint8_t uii_reserved; - void *uii_handle; - uint32_t uii_numeps; - struct usbd_pipe_information uii_pipes[1]; + uint16_t uii_len; + uint8_t uii_intfnum; + uint8_t uii_altset; + uint8_t uii_intfclass; + uint8_t uii_intfsubclass; + uint8_t uii_intfproto; + uint8_t uii_reserved; + void *uii_handle; + uint32_t uii_numeps; + struct usbd_pipe_information uii_pipes[1]; }; struct usbd_urb_select_interface { @@ -138,7 +138,7 @@ struct usbd_urb_header ubi_hdr; usb_endpoint_descriptor_t *ubi_epdesc; uint32_t ubi_trans_flags; -#define USBD_SHORT_TRANSFER_OK 0x00000002 +#define USBD_SHORT_TRANSFER_OK 0x00000002 uint32_t ubi_trans_buflen; void *ubi_trans_buf; struct mdl *ubi_mdl; @@ -166,7 +166,7 @@ struct usbd_urb_header uvc_hdr; void *uvc_reserved0; uint32_t uvc_trans_flags; -#define USBD_TRANSFER_DIRECTION_IN 1 +#define USBD_TRANSFER_DIRECTION_IN 1 uint32_t uvc_trans_buflen; void *uvc_trans_buf; struct mdl *uvc_mdl; @@ -192,11 +192,11 @@ struct usbd_urb_vendor_or_class_request uu_vcreq; }; -#define USBD_URB_STATUS(urb) ((urb)->uu_hdr.uuh_status) +#define USBD_URB_STATUS(urb) ((urb)->uu_hdr.uuh_status) -#define USBDI_VERSION 0x00000500 -#define USB_VER_1_1 0x00000110 -#define USB_VER_2_0 0x00000200 +#define USBDI_VERSION 0x00000500 +#define USB_VER_1_1 0x00000110 +#define USB_VER_2_0 0x00000200 struct usbd_version_info { uint32_t uvi_usbdi_vers;