Module Name: src Committed By: skrll Date: Sun Aug 23 11:12:01 UTC 2015
Modified Files: src/sys/dev/usb: usbdi.c usbdivar.h Log Message: Expose usbd_xfer_isread To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/dev/usb/usbdi.c cvs rdiff -u -r1.109 -r1.110 src/sys/dev/usb/usbdivar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usbdi.c diff -u src/sys/dev/usb/usbdi.c:1.163 src/sys/dev/usb/usbdi.c:1.164 --- src/sys/dev/usb/usbdi.c:1.163 Mon Feb 9 20:12:47 2015 +++ src/sys/dev/usb/usbdi.c Sun Aug 23 11:12:01 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.163 2015/02/09 20:12:47 aymeric Exp $ */ +/* $NetBSD: usbdi.c,v 1.164 2015/08/23 11:12:01 skrll Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.163 2015/02/09 20:12:47 aymeric Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.164 2015/08/23 11:12:01 skrll Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -65,16 +65,6 @@ Static void usbd_start_next(usbd_pipe_ha Static usbd_status usbd_open_pipe_ival (usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int); -static inline int -usbd_xfer_isread(usbd_xfer_handle xfer) -{ - if (xfer->rqflags & URQ_REQUEST) - return (xfer->request.bmRequestType & UT_READ); - else - return (xfer->pipe->endpoint->edesc->bEndpointAddress & - UE_DIR_IN); -} - #if defined(USB_DEBUG) void usbd_dump_iface(struct usbd_interface *iface) Index: src/sys/dev/usb/usbdivar.h diff -u src/sys/dev/usb/usbdivar.h:1.109 src/sys/dev/usb/usbdivar.h:1.110 --- src/sys/dev/usb/usbdivar.h:1.109 Sat Sep 6 10:54:04 2014 +++ src/sys/dev/usb/usbdivar.h Sun Aug 23 11:12:01 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdivar.h,v 1.109 2014/09/06 10:54:04 skrll Exp $ */ +/* $NetBSD: usbdivar.h,v 1.110 2015/08/23 11:12:01 skrll Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -325,6 +325,16 @@ void usb_needs_explore(usbd_device_hand void usb_needs_reattach(usbd_device_handle); void usb_schedsoftintr(struct usbd_bus *); +static inline int +usbd_xfer_isread(struct usbd_xfer *xfer) +{ + if (xfer->rqflags & URQ_REQUEST) + return xfer->request.bmRequestType & UT_READ; + + return xfer->pipe->endpoint->edesc->bEndpointAddress & + UE_DIR_IN; +} + /* * These macros reflect the current locking scheme. They might change. */