diff options
| author | imp <imp@FreeBSD.org> | 2007-06-11 06:21:50 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2007-06-11 06:21:50 +0000 |
| commit | 4e9fd0898407d8cb5b8437e01c61156c103c5add (patch) | |
| tree | f9ae4d1cc273770849a47f490ec3f65da20321e4 | |
| parent | b642184cf7ab11cb6e62361c767da2ceab9ace52 (diff) | |
| download | FreeBSD-src-4e9fd0898407d8cb5b8437e01c61156c103c5add.zip FreeBSD-src-4e9fd0898407d8cb5b8437e01c61156c103c5add.tar.gz | |
Expand DECLARE_USB_DMA_T inline in the one place it is used and eliminate
from usb_port.h.
| -rw-r--r-- | sys/dev/usb/usb_port.h | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usbdivar.h | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 1f8fbc6..1a514e2 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -74,14 +74,6 @@ MALLOC_DECLARE(M_USBHC); #define USBDEV(bdev) (bdev) #define USBGETSOFTC(bdev) (device_get_softc(bdev)) -#define DECLARE_USB_DMA_T \ - struct usb_dma_block; \ - typedef struct { \ - struct usb_dma_block *block; \ - u_int offs; \ - u_int len; \ - } usb_dma_t - typedef struct thread *usb_proc_ptr; #define usb_kthread_create1(f, s, p, a0, a1) \ diff --git a/sys/dev/usb/usbdivar.h b/sys/dev/usb/usbdivar.h index bab5b3c..1c8386a 100644 --- a/sys/dev/usb/usbdivar.h +++ b/sys/dev/usb/usbdivar.h @@ -43,7 +43,12 @@ #endif /* From usb_mem.h */ -DECLARE_USB_DMA_T; +struct usb_dma_block; +typedef struct { + struct usb_dma_block *block; + u_int offs; + u_int len; +} usb_dma_t; struct usbd_xfer; struct usbd_pipe; |
