Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 13 Aug 2012 18:09:19 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r239238 - head/sys/dev/usb
Message-ID:  <201208131809.q7DI9JNo074372@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208131809.q7DI9JNo074372>