Module Name: src
Committed By: skrll
Date: Wed Mar 18 15:45:45 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdi.c usbdivar.h
Log Message:
Expose usbd_xfer_isread
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.20 -r1.162.2.21 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.109.2.14 -r1.109.2.15 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.162.2.20 src/sys/dev/usb/usbdi.c:1.162.2.21
--- src/sys/dev/usb/usbdi.c:1.162.2.20 Tue Mar 17 19:02:44 2015
+++ src/sys/dev/usb/usbdi.c Wed Mar 18 15:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.162.2.20 2015/03/17 19:02:44 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.162.2.21 2015/03/18 15:45:45 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.162.2.20 2015/03/17 19:02:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.21 2015/03/18 15:45:45 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -67,16 +67,6 @@ Static void usbd_start_next(usbd_pipe_ha
Static usbd_status usbd_open_pipe_ival
(usbd_interface_handle, uint8_t, uint8_t, usbd_pipe_handle *, int);
-static inline int
-usbd_xfer_isread(usbd_xfer_handle xfer)
-{
- if (xfer->ux_rqflags & URQ_REQUEST)
- return xfer->ux_request.bmRequestType & UT_READ;
- else
- return (xfer->ux_pipe->up_endpoint->ue_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.2.14 src/sys/dev/usb/usbdivar.h:1.109.2.15
--- src/sys/dev/usb/usbdivar.h:1.109.2.14 Thu Mar 5 09:06:20 2015
+++ src/sys/dev/usb/usbdivar.h Wed Mar 18 15:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.109.2.14 2015/03/05 09:06:20 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.109.2.15 2015/03/18 15:45:45 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -329,6 +329,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(usbd_xfer_handle xfer)
+{
+ if (xfer->ux_rqflags & URQ_REQUEST)
+ return xfer->ux_request.bmRequestType & UT_READ;
+
+ return xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress &
+ UE_DIR_IN;
+}
+
/*
* These macros reflect the current locking scheme. They might change.
*/
