Lots of re-organization -- getting ready to support a composite USB device

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4329 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 13 insertions, 1 deletions

diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index 62f5d1d11..d7cd3edde 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -12,7 +12,7 @@
       <h1><big><font color="#3c34ec">
         <i>NuttX RTOS Porting Guide</i>
       </font></big></h1>
-      <p>Last Updated: December 21, 2011</p>
+      <p>Last Updated: January 24, 2011</p>
     </td>
   </tr>
 </table>
@@ -4873,6 +4873,9 @@ build
     <code>CONFIG_USBDEV</code>: Enables USB device support
   </li>
   <li>
+    <code>CONFIG_USBDEV_COMPOSITE</code>: Enables USB composite device support
+  </li>
+  <li>
     <code>CONFIG_USBDEV_ISOCHRONOUS</code>: Build in extra support for isochronous endpoints
   </li>
   <li>
@@ -4926,6 +4929,11 @@ build
     <code>CONFIG_CDCSER</code>:  Enable compilation of the USB serial driver
   </li>
   <li>
+    <code>CONFIG_CDCSER_COMPOSITE</code>:
+    Configure the CDC serial driver as part of a composite driver
+    (only if <code>CONFIG_USBDEV_COMPOSITE</code> is also defined)
+  </li>
+  <li>
     <code>CONFIG_CDCSER_EP0MAXPACKET</code>:  Endpoint 0 max packet size. Default 64.
   </li>
   <li>
@@ -4983,6 +4991,10 @@ build
     Enable compilation of the USB storage driver
   </li>
   <li>
+    <code>CONFIG_USBSTRG_COMPOSITE</code>:
+    Configure the mass storage driver as part of a composite driver
+    (only if <code>CONFIG_USBDEV_COMPOSITE</code> is also defined)
+  <li>
     <code>CONFIG_USBSTRG_EP0MAXPACKET</code>:
     Max packet size for endpoint 0
   </li>