Module Name: src
Committed By: skrll
Date: Sun Feb 7 15:50:44 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdi.c usbdi.h
Log Message:
Simplify usbd_do_request/usbd_setup_default_xfer.
G/C usbd_do_request_flags_pipe as it's not required
To generate a diff of this commit:
cvs rdiff -u -r1.162.2.41 -r1.162.2.42 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.90.4.10 -r1.90.4.11 src/sys/dev/usb/usbdi.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.41 src/sys/dev/usb/usbdi.c:1.162.2.42
--- src/sys/dev/usb/usbdi.c:1.162.2.41 Mon Dec 28 10:13:45 2015
+++ src/sys/dev/usb/usbdi.c Sun Feb 7 15:50:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.162.2.41 2015/12/28 10:13:45 skrll Exp $ */
+/* $NetBSD: usbdi.c,v 1.162.2.42 2016/02/07 15:50:43 skrll Exp $ */
/*
* Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.41 2015/12/28 10:13:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.162.2.42 2016/02/07 15:50:43 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -572,7 +572,8 @@ usbd_setup_default_xfer(struct usbd_xfer
void *priv, uint32_t timeout, usb_device_request_t *req, void *buffer,
uint32_t length, uint16_t flags, usbd_callback callback)
{
- xfer->ux_pipe = dev->ud_pipe0;
+ KASSERT(xfer->ux_pipe == dev->ud_pipe0);
+
xfer->ux_priv = priv;
xfer->ux_buffer = buffer;
xfer->ux_length = length;
@@ -1075,28 +1076,19 @@ usbd_start_next(struct usbd_pipe *pipe)
usbd_status
usbd_do_request(struct usbd_device *dev, usb_device_request_t *req, void *data)
{
- return (usbd_do_request_flags(dev, req, data, 0, 0,
- USBD_DEFAULT_TIMEOUT));
-}
-usbd_status
-usbd_do_request_flags(struct usbd_device *dev, usb_device_request_t *req,
- void *data, uint16_t flags, int *actlen, uint32_t timo)
-{
- return (usbd_do_request_flags_pipe(dev, dev->ud_pipe0, req,
- data, flags, actlen, timo));
+ return usbd_do_request_flags(dev, req, data, 0, 0,
+ USBD_DEFAULT_TIMEOUT);
}
usbd_status
-usbd_do_request_flags_pipe(struct usbd_device *dev, struct usbd_pipe *pipe,
- usb_device_request_t *req, void *data, uint16_t flags, int *actlen,
- uint32_t timeout)
+usbd_do_request_flags(struct usbd_device *dev, usb_device_request_t *req,
+ void *data, uint16_t flags, int *actlen, uint32_t timeout)
{
+ USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
struct usbd_xfer *xfer;
usbd_status err;
- USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
-
ASSERT_SLEEPABLE();
size_t len = UGETW(req->wLength);
@@ -1104,9 +1096,9 @@ usbd_do_request_flags_pipe(struct usbd_d
if (error)
return error;
- usbd_setup_default_xfer(xfer, dev, 0, timeout, req,
- data, UGETW(req->wLength), flags, NULL);
- xfer->ux_pipe = pipe;
+ usbd_setup_default_xfer(xfer, dev, 0, timeout, req, data,
+ UGETW(req->wLength), flags, NULL);
+ KASSERT(xfer->ux_pipe == dev->ud_pipe0);
err = usbd_sync_transfer(xfer);
#if defined(USB_DEBUG) || defined(DIAGNOSTIC)
if (xfer->ux_actlen > xfer->ux_length) {
Index: src/sys/dev/usb/usbdi.h
diff -u src/sys/dev/usb/usbdi.h:1.90.4.10 src/sys/dev/usb/usbdi.h:1.90.4.11
--- src/sys/dev/usb/usbdi.h:1.90.4.10 Sun Feb 7 15:48:44 2016
+++ src/sys/dev/usb/usbdi.h Sun Feb 7 15:50:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.90.4.10 2016/02/07 15:48:44 skrll Exp $ */
+/* $NetBSD: usbdi.h,v 1.90.4.11 2016/02/07 15:50:44 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -134,9 +134,7 @@ usbd_status usbd_open_pipe_intr(struct u
uint32_t, usbd_callback, int);
usbd_status usbd_do_request(struct usbd_device *, usb_device_request_t *, void *);
usbd_status usbd_do_request_flags(struct usbd_device *, usb_device_request_t *,
- void *, uint16_t, int*, uint32_t);
-usbd_status usbd_do_request_flags_pipe(struct usbd_device *, struct usbd_pipe *,
- usb_device_request_t *, void *, uint16_t, int *, uint32_t);
+ void *, uint16_t, int *, uint32_t);
usb_interface_descriptor_t *usbd_get_interface_descriptor
(struct usbd_interface *);
usb_config_descriptor_t *usbd_get_config_descriptor(struct usbd_device *);
