Fixed compilation error in the AudioInput demos when MICROPHONE_BIASED_TO_HALF_RAIL...

[pub/USBasp.git] / Demos / Host / LowLevel / VirtualSerialHost / VirtualSerialHost.c

diff --git a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
index c432258..588198b 100644 (file)
--- a/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
+++ b/Demos/Host/LowLevel/VirtualSerialHost/VirtualSerialHost.c
@@ -1,21 +1,21 @@
 /*\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
-  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
@@ -30,57 +30,11 @@
 \r
 /** \file\r
  *\r
- *  Main source file for the CDCHost demo. This file contains the main tasks of\r
+ *  Main source file for the VirtualSerialHost demo. This file contains the main tasks of\r
  *  the demo and is responsible for the initial application hardware configuration.\r
  */\r
  \r
-#include "CDCHost.h"\r
-\r
-#if 0\r
-/* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in\r
- *       <stdio.h> can be used on the virtual serial port (e.g. fprintf(&USBSerial, "Test"); to print a string).\r
- */\r
-       \r
-static int CDC_putchar(char c, FILE *stream)\r
-{        \r
-       Pipe_SelectPipe(CDC_DATAPIPE_OUT);\r
-       \r
-       if (Pipe_WaitUntilReady())\r
-         return -1;\r
-\r
-       Pipe_Write_Byte(c);\r
-       Pipe_ClearIN();\r
-       \r
-       return 0;\r
-}\r
-\r
-static int CDC_getchar(FILE *stream)\r
-{\r
-       int c;\r
-\r
-       Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
-       \r
-       for (;;)\r
-       {\r
-               if (Pipe_WaitUntilReady())\r
-                 return -1;\r
-       \r
-               if (!(Pipe_BytesInPipe()))\r
-               {\r
-                       Pipe_ClearOUT();\r
-               }\r
-               else\r
-               {\r
-                       c = Pipe_Read_Byte();\r
-                       break;\r
-               }\r
-       }\r
-       \r
-       return c;\r
-}\r
-\r
-static FILE USBSerial = FDEV_SETUP_STREAM(CDC_putchar, CDC_getchar, _FDEV_SETUP_RW);\r
-#endif\r
+#include "VirtualSerialHost.h"\r
 \r
 /** Main program entry point. This routine configures the hardware required by the application, then\r
  *  enters a loop to run the application tasks in sequence.\r
@@ -218,7 +172,6 @@ void CDC_Host_Task(void)
                case HOST_STATE_Configured:\r
                        /* Select the data IN pipe */\r
                        Pipe_SelectPipe(CDC_DATAPIPE_IN);\r
-                       Pipe_SetPipeToken(PIPE_TOKEN_IN);\r
                        Pipe_Unfreeze();\r
 \r
                        /* Check to see if a packet has been received */\r