Major synchronisation with the NetBSD USB stack:

- Some cleanup and improvements in the uhci and ohci drivers
- Support for plugging and unplugging devices improved
- Now available is bulk transport over OHCI controllers
- Resume and suspend have been temporarily been disabled again.  Proper
  support for it is available in the uhci.c and ohci.c files but I have
  not yet spent the brain cycles to use it.
- OpenBSD now uses the USB stack as well
- Add FreeBSD tags

1 files changed, 5 insertions, 12 deletions

diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 60abd5fa8c42..e254fb42e058 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,5 +1,5 @@
-/*	$NetBSD: usb_mem.h,v 1.4 1999/01/09 12:16:54 augustss Exp $	*/
-/*	$FreeBSD$	*/
+/*	$NetBSD: usb_mem.h,v 1.7 1999/09/09 12:26:47 augustss Exp $	*/
+/*	$FreeBSD$ */
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,8 +38,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__NetBSD__)
-typedef struct usb_block_dma {
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+typedef struct usb_dma_block {
 	bus_dma_tag_t tag;
 	bus_dmamap_t map;
         caddr_t kaddr;
@@ -48,14 +48,9 @@ typedef struct usb_block_dma {
         size_t size;
         size_t align;
 	int fullblock;
-	LIST_ENTRY(usb_block_dma) next;
+	LIST_ENTRY(usb_dma_block) next;
 } usb_dma_block_t;
 
-typedef struct {
-	usb_dma_block_t *block;
-	u_int offs;
-} usb_dma_t;
-
 #define DMAADDR(dma) ((dma)->block->segs[0].ds_addr + (dma)->offs)
 #define KERNADDR(dma) ((void *)((dma)->block->kaddr + (dma)->offs))
 
@@ -81,8 +76,6 @@ void		usb_freemem  __P((bus_dma_tag_t, usb_dma_t *));
 
 #include <machine/pmap.h>       /* for vtophys */
 
-typedef void * usb_dma_t;
-
 #define		usb_allocmem(t,s,a,p)	(*(p) = malloc(s, M_USB, M_NOWAIT), (*(p) == NULL? USBD_NOMEM: USBD_NORMAL_COMPLETION))
 #define		usb_freemem(t,p)	(free(*(p), M_USB))