X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/c5038f1bf44aea75f1ae1ed035cb7d523ccfdacb..cf610c5c91c3eee02dec7ca848acc8da831ad98a:/Demos/Host/LowLevel/CDCHost/CDCHost.c?ds=sidebyside

diff --git a/Demos/Host/LowLevel/CDCHost/CDCHost.c b/Demos/Host/LowLevel/CDCHost/CDCHost.c
index a423b90eb..0b09c5a93 100644
--- a/Demos/Host/LowLevel/CDCHost/CDCHost.c
+++ b/Demos/Host/LowLevel/CDCHost/CDCHost.c
@@ -36,8 +36,54 @@
  
 #include "CDCHost.h"
 
+#if 0
+/* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in
+ *       <stdio.h> can be used on the virtual serial port (e.g. fprintf(&USBSerial, "Test"); to print a string).
+ */
+	
+static int CDC_putchar(char c, FILE *stream)
+{	  
+	Pipe_SelectPipe(CDC_DATAPIPE_OUT);
+	
+	if (Pipe_WaitUntilReady())
+	  return -1;
+
+	Pipe_Write_Byte(c);
+	Pipe_ClearIN();
+	
+	return 0;
+}
+
+static int CDC_getchar(FILE *stream)
+{
+	int c;
+
+	Pipe_SelectPipe(CDC_DATAPIPE_IN);
+	
+	for (;;)
+	{
+		if (Pipe_WaitUntilReady())
+		  return -1;
+	
+		if (!(Pipe_BytesInPipe()))
+		{
+			Pipe_ClearOUT();
+		}
+		else
+		{
+			c = Pipe_Read_Byte();
+			break;
+		}
+	}
+	
+	return c;
+}
+
+static FILE USBSerial = FDEV_SETUP_STREAM(CDC_putchar, CDC_getchar, _FDEV_SETUP_RW);
+#endif
+
 /** Main program entry point. This routine configures the hardware required by the application, then
- *  starts the scheduler to run the application tasks.
+ *  enters a loop to run the application tasks in sequence.
  */
 int main(void)
 {
@@ -101,8 +147,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
 	USB_ShutDown();
 
-	puts_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"));
-	printf_P(PSTR(" -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
+	printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
+	                         " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	for(;;);
@@ -113,10 +159,10 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
  */
 void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
 {
-	puts_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"));
-	printf_P(PSTR(" -- Error Code %d\r\n"), ErrorCode);
-	printf_P(PSTR(" -- Sub Error Code %d\r\n"), SubErrorCode);
-	printf_P(PSTR(" -- In State %d\r\n" ESC_FG_WHITE), USB_HostState);
+	printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
+	                         " -- Error Code %d\r\n"
+	                         " -- Sub Error Code %d\r\n"
+	                         " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
 	
 	LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
@@ -154,8 +200,8 @@ void CDC_Host_Task(void)
 			/* Set the device configuration to the first configuration (rarely do devices use multiple configurations) */
 			if ((ErrorCode = USB_Host_SetDeviceConfiguration(1)) != HOST_SENDCONTROL_Successful)
 			{
-				puts_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"));
-				printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
+				printf_P(PSTR(ESC_FG_RED "Control Error (Set Configuration).\r\n"
+				                         " -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
 
 				/* Indicate error via status LEDs */
 				LEDs_SetAllLEDs(LEDMASK_USB_ERROR);