X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/357ccc577bc6f8710ff942019e16cfa6a08466b7..3ffa7543a05761a0c69144c9b66196b08d8f1249:/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
index 2765064f7..92449a67d 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -81,15 +81,15 @@ void SetupHardware(void)
 	clock_prescale_set(clock_div_1);
 
 	/* Hardware Initialization */
+	Serial_Init(9600, false);
 	LEDs_Init();
-	ReconfigureUSART();
-	USB_Init();	
+	USB_Init();
 }
 
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and
  *  starts the library USB task to begin the enumeration and USB management process.
  */
-void EVENT_USB_Connect(void)
+void EVENT_USB_Device_Connect(void)
 {
 	/* Indicate USB enumerating */
 	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
@@ -98,7 +98,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via
  *  the status LEDs and stops the USB management and CDC management tasks.
  */
-void EVENT_USB_Disconnect(void)
+void EVENT_USB_Device_Disconnect(void)
 {	
 	/* Reset Tx and Rx buffers, device disconnected */
 	Buffer_Initialize(&Rx_Buffer);
@@ -111,7 +111,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration
  *  of the USB device after enumeration - the device endpoints are configured and the CDC management task started.
  */
-void EVENT_USB_ConfigurationChanged(void)
+void EVENT_USB_Device_ConfigurationChanged(void)
 {
 	/* Indicate USB connected and ready */
 	LEDs_SetAllLEDs(LEDMASK_USB_READY);
@@ -137,13 +137,16 @@ void EVENT_USB_ConfigurationChanged(void)
 	{
 		LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 	}
+
+	/* Reset line encoding baud rate so that the host knows to send new values */
+	LineEncoding.BaudRateBPS = 0;
 }
 
-/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific
+/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
  *  control requests that are not handled internally by the USB library (including the CDC control commands,
  *  which are all issued via the control endpoint), so that they can be handled appropriately for the application.
  */
-void EVENT_USB_UnhandledControlPacket(void)
+void EVENT_USB_Device_UnhandledControlRequest(void)
 {
 	/* Process CDC specific control requests */
 	switch (USB_ControlRequest.bRequest)
@@ -260,11 +263,7 @@ void CDC_Task(void)
 	if ((Tx_Buffer.Elements) && LineEncoding.BaudRateBPS)
 	{
 		/* Wait until Serial Tx Endpoint Ready for Read/Write */
-		while (!(Endpoint_IsReadWriteAllowed()))
-		{
-			if (USB_DeviceState == DEVICE_STATE_Unattached)
-			  return;
-		}
+		Endpoint_WaitUntilReady();
 		
 		/* Write the bytes from the buffer to the endpoint while space is available */
 		while (Tx_Buffer.Elements && Endpoint_IsReadWriteAllowed())
@@ -284,11 +283,7 @@ void CDC_Task(void)
 		if (IsFull && !(Tx_Buffer.Elements))
 		{
 			/* Wait until Serial Tx Endpoint Ready for Read/Write */
-			while (!(Endpoint_IsReadWriteAllowed()))
-			{
-				if (USB_DeviceState == DEVICE_STATE_Unattached)
-				  return;
-			}
+			Endpoint_WaitUntilReady();
 				
 			/* Send an empty packet to terminate the transfer */
 			Endpoint_ClearIN();
@@ -301,9 +296,11 @@ void CDC_Task(void)
  */
 ISR(USART1_RX_vect, ISR_BLOCK)
 {
+	uint8_t ReceivedByte = UDR1;
+
 	/* Only store received characters if the USB interface is connected */
-	if ((USB_DeviceState != DEVICE_STATE_Configured) && LineEncoding.BaudRateBPS)
-	  Buffer_StoreElement(&Tx_Buffer, UDR1);
+	if ((USB_DeviceState == DEVICE_STATE_Configured) && LineEncoding.BaudRateBPS)
+	  Buffer_StoreElement(&Tx_Buffer, ReceivedByte);
 }
 
 /** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */