Deleted Added
full compact
if_cdce.c (191825) if_cdce.c (192499)
1/* $NetBSD: if_cdce.c,v 1.4 2004/10/24 12:50:54 augustss Exp $ */
2
3/*-
4 * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
5 * Copyright (c) 2003-2005 Craig Boston
6 * Copyright (c) 2004 Daniel Hartmeier
7 * Copyright (c) 2009 Hans Petter Selasky
8 * All rights reserved.

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

36 */
37
38/*
39 * USB Communication Device Class (Ethernet Networking Control Model)
40 * http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
41 */
42
43#include <sys/cdefs.h>
1/* $NetBSD: if_cdce.c,v 1.4 2004/10/24 12:50:54 augustss Exp $ */
2
3/*-
4 * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
5 * Copyright (c) 2003-2005 Craig Boston
6 * Copyright (c) 2004 Daniel Hartmeier
7 * Copyright (c) 2009 Hans Petter Selasky
8 * All rights reserved.

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

36 */
37
38/*
39 * USB Communication Device Class (Ethernet Networking Control Model)
40 * http://www.usb.org/developers/devclass_docs/usbcdc11.pdf
41 */
42
43#include <sys/cdefs.h>
44__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_cdce.c 191825 2009-05-05 15:39:29Z thompsa $");
44__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_cdce.c 192499 2009-05-21 00:04:17Z thompsa $");
45
46#include "usbdevs.h"
47#include <dev/usb/usb.h>
48#include <dev/usb/usb_mfunc.h>
49#include <dev/usb/usb_error.h>
50#include <dev/usb/usb_cdc.h>
51
52#define USB_DEBUG_VAR cdce_debug

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

100 .endpoint = UE_ADDR_ANY,
101 .direction = UE_DIR_RX,
102 .if_index = 0,
103 .frames = CDCE_FRAMES_MAX,
104 .bufsize = (CDCE_FRAMES_MAX * MCLBYTES),
105 .flags = {.pipe_bof = 1,.short_frames_ok = 1,.short_xfer_ok = 1,.ext_buffer = 1,},
106 .callback = cdce_bulk_read_callback,
107 .timeout = 0, /* no timeout */
45
46#include "usbdevs.h"
47#include <dev/usb/usb.h>
48#include <dev/usb/usb_mfunc.h>
49#include <dev/usb/usb_error.h>
50#include <dev/usb/usb_cdc.h>
51
52#define USB_DEBUG_VAR cdce_debug

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

100 .endpoint = UE_ADDR_ANY,
101 .direction = UE_DIR_RX,
102 .if_index = 0,
103 .frames = CDCE_FRAMES_MAX,
104 .bufsize = (CDCE_FRAMES_MAX * MCLBYTES),
105 .flags = {.pipe_bof = 1,.short_frames_ok = 1,.short_xfer_ok = 1,.ext_buffer = 1,},
106 .callback = cdce_bulk_read_callback,
107 .timeout = 0, /* no timeout */
108 .usb_mode = USB_MODE_MAX, /* both modes */
108 .usb_mode = USB_MODE_DUAL, /* both modes */
109 },
110
111 [CDCE_BULK_TX] = {
112 .type = UE_BULK,
113 .endpoint = UE_ADDR_ANY,
114 .direction = UE_DIR_TX,
115 .if_index = 0,
116 .frames = CDCE_FRAMES_MAX,
117 .bufsize = (CDCE_FRAMES_MAX * MCLBYTES),
118 .flags = {.pipe_bof = 1,.force_short_xfer = 1,.ext_buffer = 1,},
119 .callback = cdce_bulk_write_callback,
120 .timeout = 10000, /* 10 seconds */
109 },
110
111 [CDCE_BULK_TX] = {
112 .type = UE_BULK,
113 .endpoint = UE_ADDR_ANY,
114 .direction = UE_DIR_TX,
115 .if_index = 0,
116 .frames = CDCE_FRAMES_MAX,
117 .bufsize = (CDCE_FRAMES_MAX * MCLBYTES),
118 .flags = {.pipe_bof = 1,.force_short_xfer = 1,.ext_buffer = 1,},
119 .callback = cdce_bulk_write_callback,
120 .timeout = 10000, /* 10 seconds */
121 .usb_mode = USB_MODE_MAX, /* both modes */
121 .usb_mode = USB_MODE_DUAL, /* both modes */
122 },
123
124 [CDCE_INTR_RX] = {
125 .type = UE_INTERRUPT,
126 .endpoint = UE_ADDR_ANY,
127 .direction = UE_DIR_RX,
128 .if_index = 1,
129 .bufsize = CDCE_IND_SIZE_MAX,

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

356
357 c &= 0xf;
358
359 if ((i & 1) == 0)
360 c <<= 4;
361 sc->sc_ue.ue_eaddr[i / 2] |= c;
362 }
363
122 },
123
124 [CDCE_INTR_RX] = {
125 .type = UE_INTERRUPT,
126 .endpoint = UE_ADDR_ANY,
127 .direction = UE_DIR_RX,
128 .if_index = 1,
129 .bufsize = CDCE_IND_SIZE_MAX,

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

356
357 c &= 0xf;
358
359 if ((i & 1) == 0)
360 c <<= 4;
361 sc->sc_ue.ue_eaddr[i / 2] |= c;
362 }
363
364 if (uaa->usb2_mode == USB_MODE_DEVICE) {
364 if (uaa->usb_mode == USB_MODE_DEVICE) {
365 /*
366 * Do not use the same MAC address like the peer !
367 */
368 sc->sc_ue.ue_eaddr[5] ^= 0xFF;
369 }
370 }
371
372 ue->ue_sc = sc;

--- 377 unchanged lines hidden ---
365 /*
366 * Do not use the same MAC address like the peer !
367 */
368 sc->sc_ue.ue_eaddr[5] ^= 0xFF;
369 }
370 }
371
372 ue->ue_sc = sc;

--- 377 unchanged lines hidden ---