aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@FreeBSD.org>2012-08-13 18:09:19 +0000
committerHans Petter Selasky <hselasky@FreeBSD.org>2012-08-13 18:09:19 +0000
commite9cec01683b1f3f70a22f28bf4c0b275fc528f26 (patch)
tree2e4f4af712b06d279b9e8085e8fb6b10fbead9aa
parent0cb5abc7ca15f48d1d3058c4ee2912ddf3990a49 (diff)
downloadsrc-e9cec01683b1f3f70a22f28bf4c0b275fc528f26.tar.gz
src-e9cec01683b1f3f70a22f28bf4c0b275fc528f26.zip
Rename new IOCTL to singular form of the noun "streams".
MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=239238
-rw-r--r--sys/dev/usb/usb_generic.c8
-rw-r--r--sys/dev/usb/usb_ioctl.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c
index 8da4119e5749..3f495b3adb93 100644
--- a/sys/dev/usb/usb_generic.c
+++ b/sys/dev/usb/usb_generic.c
@@ -1393,7 +1393,7 @@ ugen_ioctl(struct usb_fifo *f, u_long cmd, void *addr, int fflags)
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 cmd, void *addr, int fflags)
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 cmd, void *addr, int fflags)
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) {
diff --git a/sys/dev/usb/usb_ioctl.h b/sys/dev/usb/usb_ioctl.h
index 5e8dab7e9f4c..62edb992cb11 100644
--- a/sys/dev/usb/usb_ioctl.h
+++ b/sys/dev/usb/usb_ioctl.h
@@ -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)