PERFORCE change 136644 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=136644

Change 136644 by hselasky at hselasky_laptop001 on 2008/03/02 08:45:14

	
	This commit only affects the USB device side code.
	First step towards an USB Mass Storage Device Side
	implementation.

Affected files ...

.. //depot/projects/usb/src/sys/conf/files#24 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#98 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_template.h#8 edit
.. //depot/projects/usb/src/sys/modules/usb/Makefile#9 edit

Differences ...

==== //depot/projects/usb/src/sys/conf/files#24 (text+ko) ====

@@ -1148,6 +1148,7 @@
 dev/usb/usb_subr.c		optional usb
 dev/usb/usb_template.c		optional usb
 dev/usb/usb_template_cdce.c	optional usb
+dev/usb/usb_template_msc.c	optional usb
 dev/usb/usb_transfer.c		optional usb
 dev/usb/usb_compat_linux.c	optional usb
 dev/usb/uscanner.c		optional uscanner

==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#98 (text+ko) ====

@@ -1775,6 +1775,11 @@
 	[USB_SPEED_LOW][USB_SPEED_LOW] = 1,
 };
 
+static int usb_template = 0;
+
+SYSCTL_INT(_hw_usb, OID_AUTO, template, CTLFLAG_RW,
+    &usb_template, 0, "Selected USB device side template");
+
 /*------------------------------------------------------------------------*
  *	usbd_alloc_device
  *
@@ -1927,11 +1932,14 @@
 		/* We are not self powered */
 		udev->flags.self_powered = 0;
 
-		/*
-	         * TODO: Make some kind of command that lets the user choose
-	         * the USB template.
-	         */
-		err = usbd_temp_setup(udev, &usb_template_cdce);
+		switch (usb_template) {
+		case 0:
+			err = usbd_temp_setup(udev, &usb_template_msc);
+			break;
+		default:
+			err = usbd_temp_setup(udev, &usb_template_cdce);
+			break;
+		}
 		if (err) {
 			PRINTFN(-1, ("setting up USB template failed\n"));
 			goto done;

==== //depot/projects/usb/src/sys/dev/usb/usb_template.h#8 (text+ko) ====

@@ -89,5 +89,6 @@
 /* prototypes */
 
 extern const struct usb_temp_device_desc usb_template_cdce;
+extern const struct usb_temp_device_desc usb_template_msc; /* Mass Storage Class */
 
 #endif					/* _USB_TEMPLATE_H_ */

==== //depot/projects/usb/src/sys/modules/usb/Makefile#9 (text+ko) ====

@@ -17,6 +17,7 @@
 	usb_subr.c usb_subr.h \
 	usb_template.c usb_template.h \
 	usb_template_cdce.c \
+	usb_template_msc.c \
 	usb_transfer.c \
 	usb_compat_linux.c \