Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/usb/usb_mem.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/usb/usb_mem.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.30
retrieving revision 1.30.12.1
diff -u -p -r1.30 -r1.30.12.1
--- src/sys/dev/usb/usb_mem.h	2013/01/23 23:44:30	1.30
+++ src/sys/dev/usb/usb_mem.h	2017/04/05 19:54:20	1.30.12.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_mem.h,v 1.30 2013/01/23 23:44:30 jmcneill Exp $	*/
+/*	$NetBSD: usb_mem.h,v 1.30.12.1 2017/04/05 19:54:20 snj Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -34,53 +34,27 @@
 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;
+	void *kaddr;
+	bus_dma_segment_t *segs;
+	int nsegs;
+	int nsegs_alloc;
+	size_t size;
+	size_t align;
 	int flags;
 #define USB_DMA_FULLBLOCK	0x0001
-#define USB_DMA_RESERVE		0x0002
 	LIST_ENTRY(usb_dma_block) next;
 } usb_dma_block_t;
 
 #define USBMALLOC_MULTISEG	1
 
-usbd_status	usb_allocmem(usbd_bus_handle, size_t, size_t, usb_dma_t *);
-usbd_status	usb_allocmem_flags(usbd_bus_handle, size_t, size_t, usb_dma_t *,
+usbd_status	usb_allocmem(struct usbd_bus *, size_t, size_t, usb_dma_t *);
+usbd_status	usb_allocmem_flags(struct usbd_bus *, size_t, size_t, usb_dma_t *,
 			int);
-void		usb_freemem(usbd_bus_handle, usb_dma_t *);
-void		usb_syncmem(usb_dma_t *, bus_addr_t, bus_size_t, int ops);
+void		usb_freemem(struct usbd_bus *, 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)->block->kaddr + (dma)->offs + (o)))
-
-struct extent;
-
-struct usb_dma_reserve {
-	bus_dma_tag_t dtag;
-	bus_dmamap_t map;
-	void *vaddr;
-	bus_addr_t paddr;
-	size_t size;
-	struct extent *extent;
-	device_t dv;
-};
-
-#if defined(_KERNEL_OPT)
-#include "opt_usb_mem_reserve.h"
-#endif
-
-#ifndef USB_MEM_RESERVE
-#define USB_MEM_RESERVE (256 * 1024)
-#endif
-
-usbd_status usb_reserve_allocm(struct usb_dma_reserve *, usb_dma_t *,
-				u_int32_t);
-int usb_setup_reserve(device_t, struct usb_dma_reserve *, bus_dma_tag_t, size_t);
-void usb_reserve_freem(struct usb_dma_reserve *, usb_dma_t *);
+	((void *)((char *)(dma)->udma_block->kaddr + (dma)->udma_offs + (o)))