 @@ -1,14 +1,14 @@
-/*	$NetBSD: usb_mem.h,v 1.35 2021/12/21 09:51:22 skrll Exp $	*/
+/*	$NetBSD: usb_mem.h,v 1.36 2022/02/14 09:23:32 riastradh Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -21,26 +21,29 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	_DEV_USB_USB_MEM_H_
 #define	_DEV_USB_USB_MEM_H_
 typedef struct usb_dma_block {
 	bus_dma_tag_t tag;
 	bus_dmamap_t map;
 	void *kaddr;
 	bus_dma_segment_t *segs;
 	int nsegs;
 	int nsegs_alloc;
 	size_t size;
 	size_t align;
 	int flags;
 #define USB_DMA_FULLBLOCK	__BIT(0)
 #define USB_DMA_COHERENT	__BIT(1)
 @@ -50,13 +53,15 @@ typedef struct usb_dma_block {
 #define USBMALLOC_MULTISEG	__BIT(0)
 #define USBMALLOC_COHERENT	__BIT(1)
 #define USBMALLOC_ZERO		__BIT(2)
 int		usb_allocmem(bus_dma_tag_t, size_t, size_t, u_int, usb_dma_t *);
 void		usb_freemem(usb_dma_t *);
 void		usb_syncmem(usb_dma_t *, bus_addr_t, bus_size_t, int);
 bus_addr_t	usb_dmaaddr(usb_dma_t *, unsigned int);
 #define DMAADDR(dma, o)	usb_dmaaddr((dma), (o))
 #define KERNADDR(dma, o) \
 	((void *)((char *)(dma)->udma_block->kaddr + (dma)->udma_offs + (o)))
 #endif	/* _DEV_USB_USB_MEM_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: usbdivar.h,v 1.130 2021/09/07 10:44:18 riastradh Exp $	*/
+/*	$NetBSD: usbdivar.h,v 1.131 2022/02/14 09:23:32 riastradh Exp $	*/
 /*
  * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology and Matthew R. Green (mrg@eterna.com.au).
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -20,26 +20,29 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef	_DEV_USB_USBDIVAR_H_
 #define	_DEV_USB_USBDIVAR_H_
 /*
  * Discussion about locking in the USB code:
+ *
  * The host controller presents one lock at IPL_SOFTUSB (aka IPL_SOFTNET).
+ *
  * List of hardware interface methods, and whether the lock is held
  * when each is called by this module:
+ *
  *	BUS METHOD		LOCK	NOTES
  *	----------------------- -------	-------------------------
  *	ubm_open		-	might want to take lock?
  *	ubm_softint		x
  *	ubm_dopoll		-	might want to take lock?
 @@ -387,13 +390,15 @@ usbd_xfer_isread(struct usbd_xfer *xfer)
 static __inline size_t
 usb_addr2dindex(int addr)
+{
 	return USB_ROOTHUB_INDEX + addr;
+}
 /*
  * These macros reflect the current locking scheme.  They might change.
  */
 #define usbd_lock_pipe(p)	mutex_enter((p)->up_dev->ud_bus->ub_lock)
 #define usbd_unlock_pipe(p)	mutex_exit((p)->up_dev->ud_bus->ub_lock)
 #endif	/* _DEV_USB_USBDIVAR_H_ */