Deleted Added
full compact
if_cdcereg.h (190749) if_cdcereg.h (192984)
1/*-
2 * Copyright (c) 2003-2005 Craig Boston
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
27 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
28 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
29 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
30 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 *
1/*-
2 * Copyright (c) 2003-2005 Craig Boston
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
27 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
28 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
29 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
30 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/dev/usb/net/if_cdcereg.h 190749 2009-04-05 21:24:15Z piso $
32 * $FreeBSD: head/sys/dev/usb/net/if_cdcereg.h 192984 2009-05-28 17:36:36Z thompsa $
33 */
34
35#ifndef _USB_IF_CDCEREG_H_
36#define _USB_IF_CDCEREG_H_
37
38#define CDCE_FRAMES_MAX 8 /* units */
39#define CDCE_IND_SIZE_MAX 32 /* bytes */
40
41enum {
42 CDCE_BULK_RX,
43 CDCE_BULK_TX,
44 CDCE_INTR_RX,
45 CDCE_INTR_TX,
46 CDCE_N_TRANSFER,
47};
48
49struct cdce_softc {
33 */
34
35#ifndef _USB_IF_CDCEREG_H_
36#define _USB_IF_CDCEREG_H_
37
38#define CDCE_FRAMES_MAX 8 /* units */
39#define CDCE_IND_SIZE_MAX 32 /* bytes */
40
41enum {
42 CDCE_BULK_RX,
43 CDCE_BULK_TX,
44 CDCE_INTR_RX,
45 CDCE_INTR_TX,
46 CDCE_N_TRANSFER,
47};
48
49struct cdce_softc {
50 struct usb2_ether sc_ue;
50 struct usb_ether sc_ue;
51 struct mtx sc_mtx;
51 struct mtx sc_mtx;
52 struct usb2_xfer *sc_xfer[CDCE_N_TRANSFER];
52 struct usb_xfer *sc_xfer[CDCE_N_TRANSFER];
53 struct mbuf *sc_rx_buf[CDCE_FRAMES_MAX];
54 struct mbuf *sc_tx_buf[CDCE_FRAMES_MAX];
55
56 int sc_flags;
57#define CDCE_FLAG_ZAURUS 0x0001
58#define CDCE_FLAG_NO_UNION 0x0002
59#define CDCE_FLAG_RX_DATA 0x0010
60
61 uint8_t sc_eaddr_str_index;
62 uint8_t sc_data_iface_no;
63 uint8_t sc_ifaces_index[2];
64};
65
66#define CDCE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
67#define CDCE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
68#define CDCE_LOCK_ASSERT(_sc, t) mtx_assert(&(_sc)->sc_mtx, t)
69#endif /* _USB_IF_CDCEREG_H_ */
53 struct mbuf *sc_rx_buf[CDCE_FRAMES_MAX];
54 struct mbuf *sc_tx_buf[CDCE_FRAMES_MAX];
55
56 int sc_flags;
57#define CDCE_FLAG_ZAURUS 0x0001
58#define CDCE_FLAG_NO_UNION 0x0002
59#define CDCE_FLAG_RX_DATA 0x0010
60
61 uint8_t sc_eaddr_str_index;
62 uint8_t sc_data_iface_no;
63 uint8_t sc_ifaces_index[2];
64};
65
66#define CDCE_LOCK(_sc) mtx_lock(&(_sc)->sc_mtx)
67#define CDCE_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx)
68#define CDCE_LOCK_ASSERT(_sc, t) mtx_assert(&(_sc)->sc_mtx, t)
69#endif /* _USB_IF_CDCEREG_H_ */