mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-19 10:53:58 +00:00
Code Issues Releases Activity

Rename new IOCTL to singular form of the noun "streams".

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Hans Petter Selasky 2012-08-13 18:09:19 +00:00
parent 0cb5abc7ca
commit e9cec01683
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=239238
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/usb/usb_generic.c
View File

@ -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_start *pstart;
struct usb_fs_stop *pstop; struct usb_fs_stop *pstop;
struct usb_fs_open *popen; 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_close *pclose;
struct usb_fs_clear_stall_sync *pstall; struct usb_fs_clear_stall_sync *pstall;
void *addr; void *addr;
@ -1458,7 +1458,7 @@ ugen_ioctl(struct usb_fifo *f, u_long cmd, void *addr, int fflags)
break; break;
case USB_FS_OPEN: case USB_FS_OPEN:
case USB_FS_OPEN_STREAMS: case USB_FS_OPEN_STREAM:
if (u.popen->ep_index >= f->fs_ep_max) { if (u.popen->ep_index >= f->fs_ep_max) {
error = EINVAL; error = EINVAL;
break; 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].frames = u.popen->max_frames;
usb_config[0].bufsize = u.popen->max_bufsize; usb_config[0].bufsize = u.popen->max_bufsize;
usb_config[0].usb_mode = USB_MODE_DUAL; /* both modes */ usb_config[0].usb_mode = USB_MODE_DUAL; /* both modes */
if (cmd == USB_FS_OPEN_STREAMS) if (cmd == USB_FS_OPEN_STREAM)
usb_config[0].stream_id = u.popen_streams->stream_id; usb_config[0].stream_id = u.popen_stream->stream_id;
if (usb_config[0].type == UE_CONTROL) { if (usb_config[0].type == UE_CONTROL) {
if (f->udev->flags.usb_mode != USB_MODE_HOST) { if (f->udev->flags.usb_mode != USB_MODE_HOST) {

4
sys/dev/usb/usb_ioctl.h
View File

@ -206,7 +206,7 @@ struct usb_fs_open {
uint8_t ep_no; /* bEndpointNumber */ uint8_t ep_no; /* bEndpointNumber */
}; };
struct usb_fs_open_streams { struct usb_fs_open_stream {
struct usb_fs_open fs_open; struct usb_fs_open fs_open;
uint16_t stream_id; 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_OPEN _IOWR('U', 197, struct usb_fs_open)
#define USB_FS_CLOSE _IOW ('U', 198, struct usb_fs_close) #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_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 */ /* USB quirk system interface */
#define USB_DEV_QUIRK_GET _IOWR('Q', 0, struct usb_gen_quirk) #define USB_DEV_QUIRK_GET _IOWR('Q', 0, struct usb_gen_quirk)