PERFORCE change 131924 for review

[Hans Petter Selasky]

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

Change 131924 by hselasky at 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,
 };