Module Name: src
Committed By: riastradh
Date: Sat Aug 20 11:32:20 UTC 2022
Modified Files:
src/sys/dev/usb: usbdi.c usbdi.h
Log Message:
usbdi(9): Nix resurrected usbd_request_async.
We killed this back in 2013, but it came back from the dead on a
driver imported from OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.107 -r1.108 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.242 src/sys/dev/usb/usbdi.c:1.243
--- src/sys/dev/usb/usbdi.c:1.242 Wed Apr 6 22:01:45 2022
+++ src/sys/dev/usb/usbdi.c Sat Aug 20 11:32:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.c,v 1.242 2022/04/06 22:01:45 mlelstv Exp $ */
+/* $NetBSD: usbdi.c,v 1.243 2022/08/20 11:32:20 riastradh 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.242 2022/04/06 22:01:45 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.243 2022/08/20 11:32:20 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -137,7 +137,6 @@ static void *usbd_alloc_buffer(struct us
static void usbd_free_buffer(struct usbd_xfer *);
static struct usbd_xfer *usbd_alloc_xfer(struct usbd_device *, unsigned int);
static void usbd_free_xfer(struct usbd_xfer *);
-static void usbd_request_async_cb(struct usbd_xfer *, void *, usbd_status);
static void usbd_xfer_timeout(void *);
static void usbd_xfer_timeout_task(void *);
static bool usbd_xfer_probe_timeout(struct usbd_xfer *);
@@ -1333,36 +1332,6 @@ usbd_do_request_len(struct usbd_device *
return err;
}
-static void
-usbd_request_async_cb(struct usbd_xfer *xfer, void *priv, usbd_status status)
-{
- usbd_destroy_xfer(xfer);
-}
-
-/*
- * Execute a request without waiting for completion.
- * Can be used from interrupt context.
- */
-usbd_status
-usbd_request_async(struct usbd_device *dev, struct usbd_xfer *xfer,
- usb_device_request_t *req, void *priv, usbd_callback callback)
-{
- usbd_status err;
-
- if (callback == NULL)
- callback = usbd_request_async_cb;
-
- usbd_setup_default_xfer(xfer, dev, priv,
- USBD_DEFAULT_TIMEOUT, req, NULL, UGETW(req->wLength), 0,
- callback);
- err = usbd_transfer(xfer);
- if (err != USBD_IN_PROGRESS) {
- usbd_destroy_xfer(xfer);
- return (err);
- }
- return (USBD_NORMAL_COMPLETION);
-}
-
const struct usbd_quirks *
usbd_get_quirks(struct usbd_device *dev)
{
Index: src/sys/dev/usb/usbdi.h
diff -u src/sys/dev/usb/usbdi.h:1.107 src/sys/dev/usb/usbdi.h:1.108
--- src/sys/dev/usb/usbdi.h:1.107 Thu Mar 3 06:09:33 2022
+++ src/sys/dev/usb/usbdi.h Sat Aug 20 11:32:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.107 2022/03/03 06:09:33 riastradh Exp $ */
+/* $NetBSD: usbdi.h,v 1.108 2022/08/20 11:32:20 riastradh Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -146,8 +146,6 @@ usbd_status usbd_sync_transfer(struct us
usbd_status usbd_sync_transfer_sig(struct usbd_xfer *);
usbd_status usbd_do_request(struct usbd_device *, usb_device_request_t *, void *);
-usbd_status usbd_request_async(struct usbd_device *, struct usbd_xfer *,
- usb_device_request_t *, void *, usbd_callback);
usbd_status usbd_do_request_flags(struct usbd_device *, usb_device_request_t *,
void *, uint16_t, int *, uint32_t);
usbd_status usbd_do_request_len(struct usbd_device *dev,
