summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/usb_mem.h
diff options
context:
space:
mode:
authormglocker <mglocker@openbsd.org>2013-04-15 09:23:00 +0000
committermglocker <mglocker@openbsd.org>2013-04-15 09:23:00 +0000
commitab0b1be78a33b04be9f7ec4a3d24ce14843759cb (patch)
tree343ff963916dade5930d4d0d64b50d04d9a15f9d /sys/dev/usb/usb_mem.h
parentRevert r1.37 now that we stop after the first matching protocol, tested (diff)
downloadwireguard-openbsd-ab0b1be78a33b04be9f7ec4a3d24ce14843759cb.tar.xz
wireguard-openbsd-ab0b1be78a33b04be9f7ec4a3d24ce14843759cb.zip
Get rid of various 'typedef struct' definitions and use plain structure
definitions instead. We don't change usb.h for now to stay compatible with userland. Tested by mpi@ on macppc and myself on i386. ok mpi@
Diffstat (limited to 'sys/dev/usb/usb_mem.h')
-rw-r--r--sys/dev/usb/usb_mem.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/usb/usb_mem.h b/sys/dev/usb/usb_mem.h
index 566e95b689c..f80fa4c7a70 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.13 2010/09/29 20:06:38 kettenis Exp $ */
+/* $OpenBSD: usb_mem.h,v 1.14 2013/04/15 09:23:02 mglocker Exp $ */
/* $NetBSD: usb_mem.h,v 1.20 2003/05/03 18:11:42 wiz Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_mem.h,v 1.9 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-typedef struct usb_dma_block {
+struct usb_dma_block {
bus_dma_tag_t tag;
bus_dmamap_t map;
caddr_t kaddr;
@@ -42,12 +42,12 @@ typedef struct usb_dma_block {
size_t align;
int fullblock;
LIST_ENTRY(usb_dma_block) next;
-} usb_dma_block_t;
+};
#define DMAADDR(dma, o) ((dma)->block->map->dm_segs[0].ds_addr + (dma)->offs + (o))
#define KERNADDR(dma, o) \
((void *)((char *)((dma)->block->kaddr + (dma)->offs) + (o)))
-usbd_status usb_allocmem(usbd_bus_handle,size_t,size_t, usb_dma_t *);
-void usb_freemem(usbd_bus_handle, usb_dma_t *);
-void usb_syncmem(usb_dma_t *, bus_addr_t, bus_size_t, int);
+usbd_status usb_allocmem(struct usbd_bus *,size_t,size_t, struct usb_dma *);
+void usb_freemem(struct usbd_bus *, struct usb_dma *);
+void usb_syncmem(struct usb_dma *, bus_addr_t, bus_size_t, int);