Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Jun 2011 21:04:35 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r223606 - in stable/8/sys: conf dev/usb dev/usb/template modules/usb/template
Message-ID:  <201106272104.p5RL4Zhh013719@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Mon Jun 27 21:04:35 2011
New Revision: 223606
URL: http://svn.freebsd.org/changeset/base/223606

Log:
  MFC r223467 and r223472:
  
  - Add more USB templates for various USB device classes
  - Add basic template support for USB 3.0
  - Export definition of template sysctl numbers through usb_ioctl.h

Added:
  stable/8/sys/dev/usb/template/usb_template_audio.c
     - copied, changed from r223467, head/sys/dev/usb/template/usb_template_audio.c
  stable/8/sys/dev/usb/template/usb_template_kbd.c
     - copied, changed from r223467, head/sys/dev/usb/template/usb_template_kbd.c
  stable/8/sys/dev/usb/template/usb_template_modem.c
     - copied unchanged from r223467, head/sys/dev/usb/template/usb_template_modem.c
  stable/8/sys/dev/usb/template/usb_template_mouse.c
     - copied, changed from r223467, head/sys/dev/usb/template/usb_template_mouse.c
Modified:
  stable/8/sys/conf/files
  stable/8/sys/dev/usb/template/usb_template.c
  stable/8/sys/dev/usb/template/usb_template.h
  stable/8/sys/dev/usb/template/usb_template_cdce.c
  stable/8/sys/dev/usb/template/usb_template_msc.c
  stable/8/sys/dev/usb/template/usb_template_mtp.c
  stable/8/sys/dev/usb/usb_ioctl.h
  stable/8/sys/modules/usb/template/Makefile
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/conf/files
==============================================================================
--- stable/8/sys/conf/files	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/conf/files	Mon Jun 27 21:04:35 2011	(r223606)
@@ -1855,8 +1855,12 @@ dev/usb/quirk/usb_quirk.c	optional usb
 #
 # USB templates
 #
-dev/usb/template/usb_template.c	optional usb_template
+dev/usb/template/usb_template.c		optional usb_template
+dev/usb/template/usb_template_audio.c	optional usb_template
 dev/usb/template/usb_template_cdce.c	optional usb_template
+dev/usb/template/usb_template_kbd.c	optional usb_template
+dev/usb/template/usb_template_modem.c	optional usb_template
+dev/usb/template/usb_template_mouse.c	optional usb_template
 dev/usb/template/usb_template_msc.c	optional usb_template
 dev/usb/template/usb_template_mtp.c	optional usb_template
 #

Modified: stable/8/sys/dev/usb/template/usb_template.c
==============================================================================
--- stable/8/sys/dev/usb/template/usb_template.c	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/dev/usb/template/usb_template.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -49,6 +49,7 @@
 #include <sys/priv.h>
 
 #include <dev/usb/usb.h>
+#include <dev/usb/usb_ioctl.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
 #include "usbdevs.h"
@@ -141,6 +142,31 @@ usb_make_raw_desc(struct usb_temp_setup 
 				ud->bSlaveInterface[0] +=
 				    temp->bInterfaceNumber;
 			}
+
+			/* check if we have got an interface association descriptor */
+
+			if ((raw[0] >= sizeof(struct usb_interface_assoc_descriptor)) &&
+			    (raw[1] == UDESC_IFACE_ASSOC)) {
+				struct usb_interface_assoc_descriptor *iad = (void *)dst;
+
+				/* update the interface number */
+
+				iad->bFirstInterface +=
+				    temp->bInterfaceNumber;
+			}
+
+			/* check if we have got a call management descriptor */
+
+			if ((raw[0] >= sizeof(struct usb_cdc_cm_descriptor)) &&
+			    (raw[1] == UDESC_CS_INTERFACE) &&
+			    (raw[2] == UDESCSUB_CDC_CM)) {
+				struct usb_cdc_cm_descriptor *ccd = (void *)dst;
+
+				/* update the interface number */
+
+				ccd->bDataInterface +=
+				    temp->bInterfaceNumber;
+			}
 		}
 		temp->size += len;
 	}
@@ -476,6 +502,10 @@ usb_make_device_desc(struct usb_temp_set
 			USETW(utd->udd.bcdUSB, 0x0250);
 			utd->udd.bMaxPacketSize = 255;	/* 512 bytes */
 			break;
+		case USB_SPEED_SUPER:
+			USETW(utd->udd.bcdUSB, 0x0300);
+			utd->udd.bMaxPacketSize = 9;	/* 2**9 = 512 bytes */
+			break;
 		default:
 			temp->err = USB_ERR_INVAL;
 			break;
@@ -1303,15 +1333,27 @@ usb_temp_setup_by_index(struct usb_devic
 	usb_error_t err;
 
 	switch (index) {
-	case 0:
+	case USB_TEMP_MSC:
 		err = usb_temp_setup(udev, &usb_template_msc);
 		break;
-	case 1:
+	case USB_TEMP_CDCE:
 		err = usb_temp_setup(udev, &usb_template_cdce);
 		break;
-	case 2:
+	case USB_TEMP_MTP:
 		err = usb_temp_setup(udev, &usb_template_mtp);
 		break;
+	case USB_TEMP_MODEM:
+		err = usb_temp_setup(udev, &usb_template_modem);
+		break;
+	case USB_TEMP_AUDIO:
+		err = usb_temp_setup(udev, &usb_template_audio);
+		break;
+	case USB_TEMP_KBD:
+		err = usb_temp_setup(udev, &usb_template_kbd);
+		break;
+	case USB_TEMP_MOUSE:
+		err = usb_temp_setup(udev, &usb_template_mouse);
+		break;
 	default:
 		return (USB_ERR_INVAL);
 	}

Modified: stable/8/sys/dev/usb/template/usb_template.h
==============================================================================
--- stable/8/sys/dev/usb/template/usb_template.h	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/dev/usb/template/usb_template.h	Mon Jun 27 21:04:35 2011	(r223606)
@@ -30,6 +30,10 @@
 #ifndef _USB_TEMPLATE_H_
 #define	_USB_TEMPLATE_H_
 
+#ifndef USB_TEMPLATE_VENDOR
+#define	USB_TEMPLATE_VENDOR	0x0001
+#endif
+
 typedef const void *(usb_temp_get_string_desc_t)(uint16_t lang_id, uint8_t string_index);
 typedef const void *(usb_temp_get_vendor_desc_t)(const struct usb_device_request *req, uint16_t *plen);
 
@@ -94,10 +98,14 @@ struct usb_temp_data {
 
 /* prototypes */
 
+extern const struct usb_temp_device_desc usb_template_audio;
 extern const struct usb_temp_device_desc usb_template_cdce;
-extern const struct usb_temp_device_desc usb_template_msc;	/* Mass Storage Class */
-extern const struct usb_temp_device_desc usb_template_mtp;	/* Message Transfer
-								 * Protocol */
+extern const struct usb_temp_device_desc usb_template_kbd;
+extern const struct usb_temp_device_desc usb_template_modem;
+extern const struct usb_temp_device_desc usb_template_mouse;
+extern const struct usb_temp_device_desc usb_template_msc;
+extern const struct usb_temp_device_desc usb_template_mtp;
+
 usb_error_t	usb_temp_setup(struct usb_device *,
 		    const struct usb_temp_device_desc *);
 void	usb_temp_unsetup(struct usb_device *);

Copied and modified: stable/8/sys/dev/usb/template/usb_template_audio.c (from r223467, head/sys/dev/usb/template/usb_template_audio.c)
==============================================================================
--- head/sys/dev/usb/template/usb_template_audio.c	Thu Jun 23 07:54:03 2011	(r223467, copy source)
+++ stable/8/sys/dev/usb/template/usb_template_audio.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -95,7 +95,12 @@ USB_MAKE_STRING_DESC(STRING_AUDIO_PRODUC
 
 /* prototypes */
 
-/* Audio Mixer description structures */
+/*
+ * Audio Mixer description structures
+ *
+ * Some of the audio descriptors were dumped
+ * from a Creative Labs USB audio device.
+ */
 
 static const uint8_t audio_raw_desc_0[] = {
 	0x0a, 0x24, 0x01, 0x00, 0x01, 0xa9, 0x00, 0x02,

Modified: stable/8/sys/dev/usb/template/usb_template_cdce.c
==============================================================================
--- stable/8/sys/dev/usb/template/usb_template_cdce.c	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/dev/usb/template/usb_template_cdce.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -264,7 +264,7 @@ static const struct usb_temp_config_desc
 const struct usb_temp_device_desc usb_template_cdce = {
 	.getStringDesc = &eth_get_string_desc,
 	.ppConfigDesc = eth_configs,
-	.idVendor = 0x0001,
+	.idVendor = USB_TEMPLATE_VENDOR,
 	.idProduct = 0x0001,
 	.bcdDevice = 0x0100,
 	.bDeviceClass = UDCLASS_COMM,

Copied and modified: stable/8/sys/dev/usb/template/usb_template_kbd.c (from r223467, head/sys/dev/usb/template/usb_template_kbd.c)
==============================================================================
--- head/sys/dev/usb/template/usb_template_kbd.c	Thu Jun 23 07:54:03 2011	(r223467, copy source)
+++ stable/8/sys/dev/usb/template/usb_template_kbd.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -94,6 +94,8 @@ static const struct usb_temp_interval ke
 	.bInterval[USB_SPEED_HIGH] = 2 * 8,
 };
 
+/* The following HID descriptor was dumped from a HP keyboard. */
+
 static uint8_t keyboard_hid_descriptor[] = {
 	0x05, 0x01, 0x09, 0x06, 0xa1, 0x01, 0x05, 0x07,
 	0x19, 0xe0, 0x29, 0xe7, 0x15, 0x00, 0x25, 0x01,

Copied: stable/8/sys/dev/usb/template/usb_template_modem.c (from r223467, head/sys/dev/usb/template/usb_template_modem.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/8/sys/dev/usb/template/usb_template_modem.c	Mon Jun 27 21:04:35 2011	(r223606, copy of r223467, head/sys/dev/usb/template/usb_template_modem.c)
@@ -0,0 +1,252 @@
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*-
+ * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * This file contains the USB template for an USB Modem Device.
+ */
+
+#include <sys/stdint.h>
+#include <sys/stddef.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/sysctl.h>
+#include <sys/sx.h>
+#include <sys/unistd.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/priv.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usb_cdc.h>
+
+#include <dev/usb/template/usb_template.h>
+
+enum {
+	INDEX_LANG,
+	INDEX_MODEM,
+	INDEX_PRODUCT,
+	INDEX_MAX,
+};
+
+#define	STRING_LANG \
+  0x09, 0x04,				/* American English */
+
+#define	STRING_PRODUCT \
+  'M', 0, 'o', 0, 'd', 0, 'e', 0, 'm', 0, ' ', 0, \
+  'T', 0, 'e', 0, 's', 0, 't', 0, ' ', 0, \
+  'D', 0, 'e', 0, 'v', 0, 'i', 0, 'c', 0, 'e', 0, ' ', 0, 
+
+#define	STRING_MODEM \
+  'M', 0, 'o', 0, 'd', 0, 'e', 0, 'm', 0, ' ', 0, \
+  'i', 0, 'n', 0, 't', 0, 'e', 0, 'r', 0, 'f', 0, 'a', 0, 'c', 0, 'e', 0,
+
+/* make the real string descriptors */
+
+USB_MAKE_STRING_DESC(STRING_LANG, string_lang);
+USB_MAKE_STRING_DESC(STRING_MODEM, string_modem);
+USB_MAKE_STRING_DESC(STRING_PRODUCT, string_product);
+
+#define	MODEM_IFACE_0 0
+#define	MODEM_IFACE_1 1
+
+/* prototypes */
+
+static const struct usb_temp_packet_size modem_bulk_mps = {
+	.mps[USB_SPEED_LOW] = 8,
+	.mps[USB_SPEED_FULL] = 64,
+	.mps[USB_SPEED_HIGH] = 512,
+};
+
+static const struct usb_temp_packet_size modem_intr_mps = {
+	.mps[USB_SPEED_LOW] = 8,
+	.mps[USB_SPEED_FULL] = 8,
+	.mps[USB_SPEED_HIGH] = 8,
+};
+
+static const struct usb_temp_interval modem_intr_interval = {
+	.bInterval[USB_SPEED_LOW] = 10,
+	.bInterval[USB_SPEED_FULL] = 10,
+	.bInterval[USB_SPEED_HIGH] = 10 * 8,
+};
+
+static const struct usb_temp_endpoint_desc modem_ep_0 = {
+	.pPacketSize = &modem_intr_mps,
+	.pIntervals = &modem_intr_interval,
+	.bEndpointAddress = UE_DIR_IN,
+	.bmAttributes = UE_INTERRUPT,
+};
+
+static const struct usb_temp_endpoint_desc modem_ep_1 = {
+	.pPacketSize = &modem_bulk_mps,
+	.bEndpointAddress = UE_DIR_OUT,
+	.bmAttributes = UE_BULK,
+};
+
+static const struct usb_temp_endpoint_desc modem_ep_2 = {
+	.pPacketSize = &modem_bulk_mps,
+	.bEndpointAddress = UE_DIR_IN,
+	.bmAttributes = UE_BULK,
+};
+
+static const struct usb_temp_endpoint_desc *modem_iface_0_ep[] = {
+	&modem_ep_0,
+	NULL,
+};
+
+static const struct usb_temp_endpoint_desc *modem_iface_1_ep[] = {
+	&modem_ep_1,
+	&modem_ep_2,
+	NULL,
+};
+
+static const uint8_t modem_raw_desc_0[] = {
+	0x05, 0x24, 0x00, 0x10, 0x01
+};
+
+static const uint8_t modem_raw_desc_1[] = {
+	0x05, 0x24, 0x06, MODEM_IFACE_0, MODEM_IFACE_1
+};
+
+static const uint8_t modem_raw_desc_2[] = {
+	0x05, 0x24, 0x01, 0x03, MODEM_IFACE_1
+};
+
+static const uint8_t modem_raw_desc_3[] = {
+	0x04, 0x24, 0x02, 0x07
+};
+
+static const void *modem_iface_0_desc[] = {
+	&modem_raw_desc_0,
+	&modem_raw_desc_1,
+	&modem_raw_desc_2,
+	&modem_raw_desc_3,
+	NULL,
+};
+
+static const struct usb_temp_interface_desc modem_iface_0 = {
+	.ppRawDesc = modem_iface_0_desc,
+	.ppEndpoints = modem_iface_0_ep,
+	.bInterfaceClass = 2,
+	.bInterfaceSubClass = 2,
+	.bInterfaceProtocol = 1,
+	.iInterface = INDEX_MODEM,
+};
+
+static const struct usb_temp_interface_desc modem_iface_1 = {
+	.ppEndpoints = modem_iface_1_ep,
+	.bInterfaceClass = 10,
+	.bInterfaceSubClass = 0,
+	.bInterfaceProtocol = 0,
+	.iInterface = INDEX_MODEM,
+};
+
+static const struct usb_temp_interface_desc *modem_interfaces[] = {
+	&modem_iface_0,
+	&modem_iface_1,
+	NULL,
+};
+
+static const struct usb_temp_config_desc modem_config_desc = {
+	.ppIfaceDesc = modem_interfaces,
+	.bmAttributes = UC_BUS_POWERED,
+	.bMaxPower = 25,		/* 50 mA */
+	.iConfiguration = INDEX_PRODUCT,
+};
+
+static const struct usb_temp_config_desc *modem_configs[] = {
+	&modem_config_desc,
+	NULL,
+};
+
+static usb_temp_get_string_desc_t modem_get_string_desc;
+static usb_temp_get_vendor_desc_t modem_get_vendor_desc;
+
+const struct usb_temp_device_desc usb_template_modem = {
+	.getStringDesc = &modem_get_string_desc,
+	.getVendorDesc = &modem_get_vendor_desc,
+	.ppConfigDesc = modem_configs,
+	.idVendor = USB_TEMPLATE_VENDOR,
+	.idProduct = 0x000E,
+	.bcdDevice = 0x0100,
+	.bDeviceClass = UDCLASS_COMM,
+	.bDeviceSubClass = 0,
+	.bDeviceProtocol = 0,
+	.iManufacturer = 0,
+	.iProduct = INDEX_PRODUCT,
+	.iSerialNumber = 0,
+};
+
+/*------------------------------------------------------------------------*
+ *      modem_get_vendor_desc
+ *
+ * Return values:
+ * NULL: Failure. No such vendor descriptor.
+ * Else: Success. Pointer to vendor descriptor is returned.
+ *------------------------------------------------------------------------*/
+static const void *
+modem_get_vendor_desc(const struct usb_device_request *req, uint16_t *plen)
+{
+	return (NULL);
+}
+
+/*------------------------------------------------------------------------*
+ *	modem_get_string_desc
+ *
+ * Return values:
+ * NULL: Failure. No such string.
+ * Else: Success. Pointer to string descriptor is returned.
+ *------------------------------------------------------------------------*/
+static const void *
+modem_get_string_desc(uint16_t lang_id, uint8_t string_index)
+{
+	static const void *ptr[INDEX_MAX] = {
+		[INDEX_LANG] = &string_lang,
+		[INDEX_MODEM] = &string_modem,
+		[INDEX_PRODUCT] = &string_product,
+	};
+
+	if (string_index == 0) {
+		return (&string_lang);
+	}
+	if (lang_id != 0x0409) {
+		return (NULL);
+	}
+	if (string_index < INDEX_MAX) {
+		return (ptr[string_index]);
+	}
+	return (NULL);
+}

Copied and modified: stable/8/sys/dev/usb/template/usb_template_mouse.c (from r223467, head/sys/dev/usb/template/usb_template_mouse.c)
==============================================================================
--- head/sys/dev/usb/template/usb_template_mouse.c	Thu Jun 23 07:54:03 2011	(r223467, copy source)
+++ stable/8/sys/dev/usb/template/usb_template_mouse.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -82,6 +82,8 @@ USB_MAKE_STRING_DESC(STRING_PRODUCT, str
 
 /* prototypes */
 
+/* The following HID descriptor was dumped from a HP mouse. */
+
 static uint8_t mouse_hid_descriptor[] = {
 	0x05, 0x01, 0x09, 0x02, 0xa1, 0x01, 0x09, 0x01,
 	0xa1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x03,

Modified: stable/8/sys/dev/usb/template/usb_template_msc.c
==============================================================================
--- stable/8/sys/dev/usb/template/usb_template_msc.c	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/dev/usb/template/usb_template_msc.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -173,8 +173,8 @@ static const struct usb_temp_config_desc
 const struct usb_temp_device_desc usb_template_msc = {
 	.getStringDesc = &msc_get_string_desc,
 	.ppConfigDesc = msc_configs,
-	.idVendor = 0x0001,
-	.idProduct = 0x0001,
+	.idVendor = USB_TEMPLATE_VENDOR,
+	.idProduct = 0x0012,
 	.bcdDevice = 0x0100,
 	.bDeviceClass = UDCLASS_COMM,
 	.bDeviceSubClass = 0,

Modified: stable/8/sys/dev/usb/template/usb_template_mtp.c
==============================================================================
--- stable/8/sys/dev/usb/template/usb_template_mtp.c	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/dev/usb/template/usb_template_mtp.c	Mon Jun 27 21:04:35 2011	(r223606)
@@ -191,8 +191,8 @@ const struct usb_temp_device_desc usb_te
 	.getStringDesc = &mtp_get_string_desc,
 	.getVendorDesc = &mtp_get_vendor_desc,
 	.ppConfigDesc = mtp_configs,
-	.idVendor = 0x0001,
-	.idProduct = 0x0001,
+	.idVendor = USB_TEMPLATE_VENDOR,
+	.idProduct = 0x0011,
 	.bcdDevice = 0x0100,
 	.bDeviceClass = 0,
 	.bDeviceSubClass = 0,

Modified: stable/8/sys/dev/usb/usb_ioctl.h
==============================================================================
--- stable/8/sys/dev/usb/usb_ioctl.h	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/dev/usb/usb_ioctl.h	Mon Jun 27 21:04:35 2011	(r223606)
@@ -39,6 +39,20 @@
 #define	USB_DEVICE_NAME "usbctl"
 #define	USB_DEVICE_DIR "usb"
 #define	USB_GENERIC_NAME "ugen"
+#define	USB_TEMPLATE_SYSCTL "hw.usb.template"	/* integer type */
+
+/* Definition of valid template sysctl values */
+
+enum {
+	USB_TEMP_MSC,		/* USB Mass Storage */
+	USB_TEMP_CDCE,		/* USB CDC Ethernet */
+	USB_TEMP_MTP,		/* Message Transfer Protocol */
+	USB_TEMP_MODEM,		/* USB CDC Modem */
+	USB_TEMP_AUDIO,		/* USB Audio */
+	USB_TEMP_KBD,		/* USB Keyboard */
+	USB_TEMP_MOUSE,		/* USB Mouse */
+	USB_TEMP_MAX,
+};
 
 struct usb_read_dir {
 #ifdef COMPAT_32BIT

Modified: stable/8/sys/modules/usb/template/Makefile
==============================================================================
--- stable/8/sys/modules/usb/template/Makefile	Mon Jun 27 20:59:43 2011	(r223605)
+++ stable/8/sys/modules/usb/template/Makefile	Mon Jun 27 21:04:35 2011	(r223606)
@@ -31,6 +31,13 @@ S=     ${.CURDIR}/../../..
 
 KMOD=	usb_template
 SRCS=	opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h vnode_if.h usbdevs.h \
-	usb_template.c usb_template_cdce.c usb_template_msc.c usb_template_mtp.c
+	usb_template.c \
+	usb_template_audio.c \
+	usb_template_cdce.c \
+	usb_template_kbd.c \
+	usb_template_modem.c \
+	usb_template_mouse.c \
+	usb_template_msc.c \
+	usb_template_mtp.c
 
 .include <bsd.kmod.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106272104.p5RL4Zhh013719>