From owner-svn-src-head@FreeBSD.ORG Mon Aug 13 18:09:20 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5BCFA1065673; Mon, 13 Aug 2012 18:09:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2C39D8FC18; Mon, 13 Aug 2012 18:09:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7DI9Kvj074375; Mon, 13 Aug 2012 18:09:20 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7DI9JNo074372; Mon, 13 Aug 2012 18:09:19 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201208131809.q7DI9JNo074372@svn.freebsd.org> From: Hans Petter Selasky Date: Mon, 13 Aug 2012 18:09:19 +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: r239238 - head/sys/dev/usb X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2012 18:09:20 -0000 Author: hselasky Date: Mon Aug 13 18:09:19 2012 New Revision: 239238 URL: http://svn.freebsd.org/changeset/base/239238 Log: Rename new IOCTL to singular form of the noun "streams". MFC after: 2 weeks Modified: head/sys/dev/usb/usb_generic.c head/sys/dev/usb/usb_ioctl.h Modified: head/sys/dev/usb/usb_generic.c ============================================================================== --- head/sys/dev/usb/usb_generic.c Mon Aug 13 18:00:34 2012 (r239237) +++ head/sys/dev/usb/usb_generic.c Mon Aug 13 18:09:19 2012 (r239238) @@ -1393,7 +1393,7 @@ ugen_ioctl(struct usb_fifo *f, u_long cm struct usb_fs_start *pstart; struct usb_fs_stop *pstop; struct usb_fs_open *popen; - struct usb_fs_open_streams *popen_streams; + struct usb_fs_open_stream *popen_stream; struct usb_fs_close *pclose; struct usb_fs_clear_stall_sync *pstall; void *addr; @@ -1458,7 +1458,7 @@ ugen_ioctl(struct usb_fifo *f, u_long cm break; case USB_FS_OPEN: - case USB_FS_OPEN_STREAMS: + case USB_FS_OPEN_STREAM: if (u.popen->ep_index >= f->fs_ep_max) { error = EINVAL; break; @@ -1510,8 +1510,8 @@ ugen_ioctl(struct usb_fifo *f, u_long cm usb_config[0].frames = u.popen->max_frames; usb_config[0].bufsize = u.popen->max_bufsize; usb_config[0].usb_mode = USB_MODE_DUAL; /* both modes */ - if (cmd == USB_FS_OPEN_STREAMS) - usb_config[0].stream_id = u.popen_streams->stream_id; + if (cmd == USB_FS_OPEN_STREAM) + usb_config[0].stream_id = u.popen_stream->stream_id; if (usb_config[0].type == UE_CONTROL) { if (f->udev->flags.usb_mode != USB_MODE_HOST) { Modified: head/sys/dev/usb/usb_ioctl.h ============================================================================== --- head/sys/dev/usb/usb_ioctl.h Mon Aug 13 18:00:34 2012 (r239237) +++ head/sys/dev/usb/usb_ioctl.h Mon Aug 13 18:09:19 2012 (r239238) @@ -206,7 +206,7 @@ struct usb_fs_open { uint8_t ep_no; /* bEndpointNumber */ }; -struct usb_fs_open_streams { +struct usb_fs_open_stream { struct usb_fs_open fs_open; uint16_t stream_id; }; @@ -307,7 +307,7 @@ struct usb_gen_quirk { #define USB_FS_OPEN _IOWR('U', 197, struct usb_fs_open) #define USB_FS_CLOSE _IOW ('U', 198, struct usb_fs_close) #define USB_FS_CLEAR_STALL_SYNC _IOW ('U', 199, struct usb_fs_clear_stall_sync) -#define USB_FS_OPEN_STREAMS _IOWR('U', 200, struct usb_fs_open_streams) +#define USB_FS_OPEN_STREAM _IOWR('U', 200, struct usb_fs_open_stream) /* USB quirk system interface */ #define USB_DEV_QUIRK_GET _IOWR('Q', 0, struct usb_gen_quirk)