Add LUFA-side channel open/close routines, add signalling handlers for the creation...

[pub/USBasp.git] / Demos / Host / LowLevel / RNDISEthernetHost / ConfigDescriptor.c

diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c b/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c
index 47ae776..5a173d6 100644 (file)
--- a/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/ConfigDescriptor.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -41,9 +41,9 @@
  *  routine will read in the entire configuration descriptor, and configure the hosts pipes to correctly communicate\r
  *  with compatible devices.\r
  *\r
  *  routine will read in the entire configuration descriptor, and configure the hosts pipes to correctly communicate\r
  *  with compatible devices.\r
  *\r

- *  This routine searches for a CDC interface descriptor containing bulk data IN and OUT endpoints, and an interrupt event endpoint.\r
+ *  This routine searches for a RNDIS interface descriptor containing bulk data IN and OUT endpoints, and an interrupt event endpoint.\r

  *\r
  *\r

- *  \return An error code from the \ref CDCHost_GetConfigDescriptorDataCodes_t enum.\r
+ *  \return An error code from the \ref RNDISHost_GetConfigDescriptorDataCodes_t enum.\r

  */\r
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r
  */\r
 uint8_t ProcessConfigurationDescriptor(void)\r
 {\r


@@ -145,10 +145,6 @@ uint8_t ProcessConfigurationDescriptor(void)
                        /* Check if the endpoint is a bulk IN or bulk OUT endpoint */\r
                        if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
                        {\r
                        /* Check if the endpoint is a bulk IN or bulk OUT endpoint */\r
                        if (EndpointData->EndpointAddress & ENDPOINT_DESCRIPTOR_DIR_IN)\r
                        {\r

-                               /* Kill the configured OUT pipe if the data endpoints are bidirectional */\r
-                               if (Pipe_IsEndpointBound(EndpointData->EndpointAddress))\r
-                                 Pipe_DisablePipe();\r
-\r

                                /* Configure the data IN pipe */\r
                                Pipe_ConfigurePipe(RNDIS_DATAPIPE_IN, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
                                /* Configure the data IN pipe */\r
                                Pipe_ConfigurePipe(RNDIS_DATAPIPE_IN, EP_TYPE_BULK, PIPE_TOKEN_IN,\r
                                                                   EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r


@@ -158,13 +154,9 @@ uint8_t ProcessConfigurationDescriptor(void)
                        }\r
                        else\r
                        {\r
                        }\r
                        else\r
                        {\r

-                               /* Only configure the OUT data pipe if the data endpoints haev not shown to be bidirectional */\r
-                               if (!(Pipe_IsEndpointBound(EndpointData->EndpointAddress)))\r
-                               {\r
-                                       /* Configure the data OUT pipe */\r
-                                       Pipe_ConfigurePipe(RNDIS_DATAPIPE_OUT, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
-                                                                          EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r
-                               }\r
+                               /* Configure the data OUT pipe */\r
+                               Pipe_ConfigurePipe(RNDIS_DATAPIPE_OUT, EP_TYPE_BULK, PIPE_TOKEN_OUT,\r
+                                                                  EndpointData->EndpointAddress, EndpointData->EndpointSize, PIPE_BANK_SINGLE);\r

                                \r
                                /* Set the flag indicating that the data OUT pipe has been found */\r
                                FoundEndpoints |= (1 << RNDIS_DATAPIPE_OUT);\r
                                \r
                                /* Set the flag indicating that the data OUT pipe has been found */\r
                                FoundEndpoints |= (1 << RNDIS_DATAPIPE_OUT);\r