Deleted Added
sdiff udiff text old ( 290441 ) new ( 292080 )
full compact
if_cdce.c (290441) if_cdce.c (292080)
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.

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

41 */
42
43/*
44 * USB Network Control Model (NCM)
45 * http://www.usb.org/developers/devclass_docs/NCM10.zip
46 */
47
48#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.

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

41 */
42
43/*
44 * USB Network Control Model (NCM)
45 * http://www.usb.org/developers/devclass_docs/NCM10.zip
46 */
47
48#include <sys/cdefs.h>
49__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_cdce.c 290441 2015-11-06 12:54:27Z hselasky $");
49__FBSDID("$FreeBSD: head/sys/dev/usb/net/if_cdce.c 292080 2015-12-11 05:28:00Z imp $");
50
51#include <sys/stdint.h>
52#include <sys/stddef.h>
53#include <sys/param.h>
54#include <sys/queue.h>
55#include <sys/types.h>
56#include <sys/systm.h>
57#include <sys/socket.h>

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

251 .size = sizeof(struct cdce_softc),
252};
253
254static devclass_t cdce_devclass;
255static eventhandler_tag cdce_etag;
256
257static int cdce_driver_loaded(struct module *, int, void *);
258
50
51#include <sys/stdint.h>
52#include <sys/stddef.h>
53#include <sys/param.h>
54#include <sys/queue.h>
55#include <sys/types.h>
56#include <sys/systm.h>
57#include <sys/socket.h>

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

251 .size = sizeof(struct cdce_softc),
252};
253
254static devclass_t cdce_devclass;
255static eventhandler_tag cdce_etag;
256
257static int cdce_driver_loaded(struct module *, int, void *);
258
259DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, cdce_driver_loaded, 0);
260MODULE_VERSION(cdce, 1);
261MODULE_DEPEND(cdce, uether, 1, 1, 1);
262MODULE_DEPEND(cdce, usb, 1, 1, 1);
263MODULE_DEPEND(cdce, ether, 1, 1, 1);
264
265static const struct usb_ether_methods cdce_ue_methods = {
266 .ue_attach_post = cdce_attach_post,
267 .ue_start = cdce_start,
268 .ue_init = cdce_init,
269 .ue_stop = cdce_stop,
270 .ue_setmulti = cdce_setmulti,
271 .ue_setpromisc = cdce_setpromisc,
272};
273
274static const STRUCT_USB_HOST_ID cdce_switch_devs[] = {
275 {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E3272_INIT, MSC_EJECT_HUAWEI2)},
276};
277
278static const STRUCT_USB_HOST_ID cdce_host_devs[] = {
279 {USB_VPI(USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632, CDCE_FLAG_NO_UNION)},
280 {USB_VPI(USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250, CDCE_FLAG_NO_UNION)},
281 {USB_VPI(USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX, CDCE_FLAG_NO_UNION)},

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

302};
303
304static const STRUCT_USB_DUAL_ID cdce_dual_devs[] = {
305 {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL, 0)},
306 {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_MOBILE_DIRECT_LINE_MODEL, 0)},
307 {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_NETWORK_CONTROL_MODEL, 0)},
308};
309
259static const STRUCT_USB_HOST_ID cdce_switch_devs[] = {
260 {USB_VPI(USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E3272_INIT, MSC_EJECT_HUAWEI2)},
261};
262
263static const STRUCT_USB_HOST_ID cdce_host_devs[] = {
264 {USB_VPI(USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632, CDCE_FLAG_NO_UNION)},
265 {USB_VPI(USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250, CDCE_FLAG_NO_UNION)},
266 {USB_VPI(USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX, CDCE_FLAG_NO_UNION)},

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

287};
288
289static const STRUCT_USB_DUAL_ID cdce_dual_devs[] = {
290 {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL, 0)},
291 {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_MOBILE_DIRECT_LINE_MODEL, 0)},
292 {USB_IF_CSI(UICLASS_CDC, UISUBCLASS_NETWORK_CONTROL_MODEL, 0)},
293};
294
295DRIVER_MODULE(cdce, uhub, cdce_driver, cdce_devclass, cdce_driver_loaded, 0);
296MODULE_VERSION(cdce, 1);
297MODULE_DEPEND(cdce, uether, 1, 1, 1);
298MODULE_DEPEND(cdce, usb, 1, 1, 1);
299MODULE_DEPEND(cdce, ether, 1, 1, 1);
300USB_PNP_DEVICE_INFO(cdce_switch_devs);
301USB_PNP_HOST_INFO(cdce_host_devs);
302USB_PNP_DUAL_INFO(cdce_dual_devs);
303
304static const struct usb_ether_methods cdce_ue_methods = {
305 .ue_attach_post = cdce_attach_post,
306 .ue_start = cdce_start,
307 .ue_init = cdce_init,
308 .ue_stop = cdce_stop,
309 .ue_setmulti = cdce_setmulti,
310 .ue_setpromisc = cdce_setpromisc,
311};
312
310#if CDCE_HAVE_NCM
311/*------------------------------------------------------------------------*
312 * cdce_ncm_init
313 *
314 * Return values:
315 * 0: Success
316 * Else: Failure
317 *------------------------------------------------------------------------*/

--- 1261 unchanged lines hidden --- 		313#if CDCE_HAVE_NCM
314/*------------------------------------------------------------------------*
315 * cdce_ncm_init
316 *
317 * Return values:
318 * 0: Success
319 * Else: Failure
320 *------------------------------------------------------------------------*/

--- 1261 unchanged lines hidden ---