diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-01-07 23:07:57 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-01-07 23:07:57 +0000 |
| commit | f85edabd28f8c9ebaeed20a6bdb7ddef1ff1c098 (patch) | |
| tree | c8f677155dd2322c9b2477c85e8f2959ef963429 /sys/dev/usb/uhcivar.h | |
| parent | b118bd4907acdfd7a8cb3f83f50f0219e395b4a3 (diff) | |
| download | FreeBSD-src-f85edabd28f8c9ebaeed20a6bdb7ddef1ff1c098.zip FreeBSD-src-f85edabd28f8c9ebaeed20a6bdb7ddef1ff1c098.tar.gz | |
Major synchronisation with NetBSD USB code
Diffstat (limited to 'sys/dev/usb/uhcivar.h')
| -rw-r--r-- | sys/dev/usb/uhcivar.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/usb/uhcivar.h b/sys/dev/usb/uhcivar.h index b714269..7143c42 100644 --- a/sys/dev/usb/uhcivar.h +++ b/sys/dev/usb/uhcivar.h @@ -1,12 +1,13 @@ -/* $NetBSD: uhcivar.h,v 1.3 1998/07/26 00:40:59 augustss Exp $ */ +/* $NetBSD: uhcivar.h,v 1.5 1998/12/26 12:53:02 augustss Exp $ */ /* FreeBSD $Id$ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. * - * Author: Lennart Augustsson <augustss@carlstedt.se> - * Carlstedt Research & Technology + * This code is derived from software contributed to The NetBSD Foundation + * by Lennart Augustsson (augustss@carlstedt.se) at + * Carlstedt Research & Technology. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -63,14 +64,14 @@ typedef struct uhci_soft_td uhci_soft_td_t; * searched at interrupt time. */ typedef struct uhci_intr_info { -#if defined(__FreeBSD__) - struct callout_handle timeout_handle; -#endif struct uhci_softc *sc; usbd_request_handle reqh; uhci_soft_td_t *stdstart; uhci_soft_td_t *stdend; LIST_ENTRY(uhci_intr_info) list; +#if defined(__FreeBSD__) + struct callout_handle timeout_handle; +#endif /* defined(__FreeBSD__) */ #ifdef DIAGNOSTIC int isdone; #endif @@ -121,12 +122,12 @@ typedef struct uhci_softc { bus_space_tag_t iot; bus_space_handle_t ioh; - bus_dma_tag_t sc_dmatag; /* DMA tag */ + bus_dma_tag_t sc_dmatag; /* DMA tag */ /* XXX should keep track of all DMA memory */ #elif defined(__FreeBSD__) int sc_iobase; int unit; -#endif +#endif /* defined(__FreeBSD__) */ uhci_physaddr_t *sc_pframes; struct uhci_vframe sc_vframes[UHCI_VFRAMELIST_COUNT]; |
