summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-13 11:31:34 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-13 11:31:34 +0000
commitd8258ff14db3f197034ef0dfd64a9dd826b453d3 (patch)
tree411bfb3d2b2e244f90f600430e8f19988684446f /sys/dev
parent70eb0fa72cdc4c418f74a322d530ef64a2e8dd02 (diff)
Remove the definition and (single) use of the DECLARE_USB_DMA_T macro.
No binary change. ok dlg.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/usb_port.h9
-rw-r--r--sys/dev/usb/usbdivar.h8
2 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 776de752a8f..98a7cdadc21 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_port.h,v 1.89 2007/06/13 11:15:29 mbalmer Exp $ */
+/* $OpenBSD: usb_port.h,v 1.90 2007/06/13 11:31:33 mbalmer Exp $ */
/* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -61,13 +61,6 @@
#define mstohz(ms) ((ms) * hz / 1000)
-#define DECLARE_USB_DMA_T \
- struct usb_dma_block; \
- typedef struct { \
- struct usb_dma_block *block; \
- u_int offs; \
- } usb_dma_t
-
#define USB_DECLARE_DRIVER_CLASS(dname, devclass) \
int __CONCAT(dname,_match)(struct device *, void *, void *); \
void __CONCAT(dname,_attach)(struct device *, struct device *, void *); \
diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h
index ded614dc4dc..1c65a5bb8ed 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/dev/usb/usbdivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdivar.h,v 1.30 2007/06/13 06:25:03 mbalmer Exp $ */
+/* $OpenBSD: usbdivar.h,v 1.31 2007/06/13 11:31:33 mbalmer Exp $ */
/* $NetBSD: usbdivar.h,v 1.70 2002/07/11 21:14:36 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdivar.h,v 1.11 1999/11/17 22:33:51 n_hibma Exp $ */
@@ -40,7 +40,11 @@
*/
/* From usb_mem.h */
-DECLARE_USB_DMA_T;
+struct usb_dma_block;
+typedef struct {
+ struct usb_dma_block *block;
+ u_int offs;
+} usb_dma_t;
struct usbd_xfer;
struct usbd_pipe;