From owner-p4-projects@FreeBSD.ORG  Fri Dec 28 22:50:18 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BAD216A420; Fri, 28 Dec 2007 22:50:18 +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 C268916A41B
	for <perforce@FreeBSD.org>; Fri, 28 Dec 2007 22:50:17 +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 CBC0413C467
	for <perforce@FreeBSD.org>; Fri, 28 Dec 2007 22:50:17 +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 lBSMoH7I026909
	for <perforce@FreeBSD.org>; Fri, 28 Dec 2007 22:50:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBSMoHt6026905
	for perforce@freebsd.org; Fri, 28 Dec 2007 22:50:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Fri, 28 Dec 2007 22:50:17 GMT
Message-Id: <200712282250.lBSMoHt6026905@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 131924 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Dec 2007 22:50:18 -0000

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

Change 131924 by hselasky@hselasky_laptop001 on 2007/12/28 22:49:51

	
	USB CDC Ethernet template related:
	
	 o Reduce power usage so that we don't exceed the 
	   HUB's power budget.
	 o Update some strings.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_template_cdce.c#3 edit

Differences ...

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

@@ -58,19 +58,21 @@
 
 #define STRING_ETH_CONTROL \
   'U', 0, 'S', 0, 'B', 0, ' ', 0, \
-  'C', 0, 'D', 0, 'C', 0, ' ', 0, \
-  'C', 0, 'o', 0, 'm', 0, 'm', 0, \
-  ' ', 0, 'i', 0, 'n', 0, 't', 0, \
-  'e', 0, 'r', 0, 'f', 0, 'a', 0, \
-  'c', 0, 'e', 0,
+  'E', 0, 't', 0, 'h', 0, 'e', 0, \
+  'r', 0, 'n', 0, 'e', 0, 't', 0, \
+  ' ', 0, 'C', 0, 'o', 0, 'm', 0, \
+  'm', 0, ' ', 0, 'i', 0, 'n', 0, \
+  't', 0, 'e', 0, 'r', 0, 'f', 0, \
+  'a', 0, 'c', 0, 'e', 0,
 
 #define STRING_ETH_DATA \
   'U', 0, 'S', 0, 'B', 0, ' ', 0, \
-  'C', 0, 'D', 0, 'C', 0, ' ', 0, \
-  'D', 0, 'a', 0, 't', 0, 'a', 0, \
-  ' ', 0, 'i', 0, 'n', 0, 't', 0, \
-  'e', 0, 'r', 0, 'f', 0, 'a', 0, \
-  'c', 0, 'e', 0,
+  'E', 0, 't', 0, 'h', 0, 'e', 0, \
+  'r', 0, 'n', 0, 'e', 0, 't', 0, \
+  ' ', 0, 'D', 0, 'a', 0, 't', 0, \
+  'a', 0, ' ', 0, 'i', 0, 'n', 0, \
+  't', 0, 'e', 0, 'r', 0, 'f', 0, \
+  'a', 0, 'c', 0, 'e', 0,
 
 #define STRING_ETH_CONFIG \
   'D', 0, 'e', 0, 'f', 0, 'a', 0, \
@@ -212,7 +214,7 @@
 static const struct usb_temp_config_desc eth_config_desc = {
 	.ppIfaceDesc = eth_interfaces,
 	.bmAttributes = UC_BUS_POWERED,
-	.bMaxPower = 250,		/* 500 mA */
+	.bMaxPower = 25,		/* 50 mA */
 	.iConfiguration = STRING_ETH_CONFIG_INDEX,
 };