summaryrefslogtreecommitdiff
path: root/sys/dev/usb/usb_mem.h
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>1999-08-27 09:00:31 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>1999-08-27 09:00:31 +0000
commitc6d969a5ffa607045a4b07b03b1fe4f278f5a5c2 (patch)
treed8ef2fc89f8ed5df12c8b5113f1ed266a160dc56 /sys/dev/usb/usb_mem.h
parentc79e6b116f4cd7baa14086e6fcda5e8b1f733082 (diff)
Sync with NetBSD;
Make sure not to call tsleep() from suspend/resume routine. Move more of the transfer completion processing to HC independent code. Fix some problems with transfer abort & timeout. Merge the soft_{td,qh} with the real {td,qh}. This saves time and space.
Diffstat (limited to 'sys/dev/usb/usb_mem.h')
-rw-r--r--sys/dev/usb/usb_mem.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 041127807bb..9c5ae8f435c 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/dev/usb/usb_mem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_mem.h,v 1.1 1999/08/13 05:28:04 fgsch Exp $ */
+/* $OpenBSD: usb_mem.h,v 1.2 1999/08/27 09:00:30 fgsch Exp $ */
/* $NetBSD: usb_mem.h,v 1.4 1999/01/09 12:16:54 augustss Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#if defined(__NetBSD__) || defined(__OpenBSD__)
-typedef struct usb_block_dma {
+typedef struct usb_dma_block {
bus_dma_tag_t tag;
bus_dmamap_t map;
caddr_t kaddr;
@@ -48,11 +48,11 @@ 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;
+ struct usb_dma_block *block;
u_int offs;
} usb_dma_t;