Deleted Added
sdiff udiff text old ( 192984 ) new ( 194228 )
full compact
usb_template_cdce.c (192984) usb_template_cdce.c (194228)
1#include <sys/cdefs.h>
1#include <sys/cdefs.h>
2__FBSDID("$FreeBSD: head/sys/dev/usb/template/usb_template_cdce.c 192984 2009-05-28 17:36:36Z thompsa $");
2__FBSDID("$FreeBSD: head/sys/dev/usb/template/usb_template_cdce.c 194228 2009-06-15 01:02:43Z thompsa $");
3
4/*-
5 * Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

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

111USB_MAKE_STRING_DESC(STRING_ETH_DATA, string_eth_data);
112USB_MAKE_STRING_DESC(STRING_ETH_CONFIG, string_eth_config);
113USB_MAKE_STRING_DESC(STRING_ETH_VENDOR, string_eth_vendor);
114USB_MAKE_STRING_DESC(STRING_ETH_PRODUCT, string_eth_product);
115USB_MAKE_STRING_DESC(STRING_ETH_SERIAL, string_eth_serial);
116
117/* prototypes */
118
3
4/*-
5 * Copyright (c) 2007 Hans Petter Selasky <hselasky@FreeBSD.org>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

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

111USB_MAKE_STRING_DESC(STRING_ETH_DATA, string_eth_data);
112USB_MAKE_STRING_DESC(STRING_ETH_CONFIG, string_eth_config);
113USB_MAKE_STRING_DESC(STRING_ETH_VENDOR, string_eth_vendor);
114USB_MAKE_STRING_DESC(STRING_ETH_PRODUCT, string_eth_product);
115USB_MAKE_STRING_DESC(STRING_ETH_SERIAL, string_eth_serial);
116
117/* prototypes */
118
119static usb2_temp_get_string_desc_t eth_get_string_desc;
119static usb_temp_get_string_desc_t eth_get_string_desc;
120
121static const struct usb_cdc_union_descriptor eth_union_desc = {
122 .bLength = sizeof(eth_union_desc),
123 .bDescriptorType = UDESC_CS_INTERFACE,
124 .bDescriptorSubtype = UDESCSUB_CDC_UNION,
125 .bMasterInterface = 0, /* this is automatically updated */
126 .bSlaveInterface[0] = 1, /* this is automatically updated */
127};

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

239 .iConfiguration = STRING_ETH_CONFIG_INDEX,
240};
241
242static const struct usb_temp_config_desc *eth_configs[] = {
243 &eth_config_desc,
244 NULL,
245};
246
120
121static const struct usb_cdc_union_descriptor eth_union_desc = {
122 .bLength = sizeof(eth_union_desc),
123 .bDescriptorType = UDESC_CS_INTERFACE,
124 .bDescriptorSubtype = UDESCSUB_CDC_UNION,
125 .bMasterInterface = 0, /* this is automatically updated */
126 .bSlaveInterface[0] = 1, /* this is automatically updated */
127};

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

239 .iConfiguration = STRING_ETH_CONFIG_INDEX,
240};
241
242static const struct usb_temp_config_desc *eth_configs[] = {
243 &eth_config_desc,
244 NULL,
245};
246
247const struct usb_temp_device_desc usb2_template_cdce = {
247const struct usb_temp_device_desc usb_template_cdce = {
248 .getStringDesc = &eth_get_string_desc,
249 .ppConfigDesc = eth_configs,
250 .idVendor = 0x0001,
251 .idProduct = 0x0001,
252 .bcdDevice = 0x0100,
253 .bDeviceClass = UDCLASS_COMM,
254 .bDeviceSubClass = 0,
255 .bDeviceProtocol = 0,

--- 37 unchanged lines hidden --- 		248 .getStringDesc = &eth_get_string_desc,
249 .ppConfigDesc = eth_configs,
250 .idVendor = 0x0001,
251 .idProduct = 0x0001,
252 .bcdDevice = 0x0100,
253 .bDeviceClass = UDCLASS_COMM,
254 .bDeviceSubClass = 0,
255 .bDeviceProtocol = 0,

--- 37 unchanged lines hidden ---