From owner-p4-projects@FreeBSD.ORG Sun Mar 2 08:45:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 034F81065674; Sun, 2 Mar 2008 08:45:55 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6DAC106566B for ; Sun, 2 Mar 2008 08:45:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AA3C38FC1B for ; Sun, 2 Mar 2008 08:45:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m228jsso044201 for ; Sun, 2 Mar 2008 08:45:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m228js2o044199 for perforce@freebsd.org; Sun, 2 Mar 2008 08:45:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 2 Mar 2008 08:45:54 GMT Message-Id: <200803020845.m228js2o044199@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 136644 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2008 08:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=136644 Change 136644 by hselasky@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 \