Fixed incorrect endpoint bank setup on the UC3 architecture (thanks to Andrus Aaslaid).

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

diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
index abbd2be..d941e42 100644 (file)
--- a/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/VirtualSerialHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2012.
+     Copyright (C) Dean Camera, 2018.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2018  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -87,12 +87,14 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {

+#if (ARCH == ARCH_AVR8)

        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

+#endif

 
        /* Hardware Initialization */
        Serial_Init(9600, false);
 
        /* Hardware Initialization */
        Serial_Init(9600, false);


@@ -170,17 +172,17 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                return;
        }
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
                return;
        }

-       
+

        VirtualSerial_CDC_Interface.State.LineEncoding.BaudRateBPS = 9600;
        VirtualSerial_CDC_Interface.State.LineEncoding.CharFormat  = CDC_LINEENCODING_OneStopBit;
        VirtualSerial_CDC_Interface.State.LineEncoding.ParityType  = CDC_PARITY_None;
        VirtualSerial_CDC_Interface.State.LineEncoding.DataBits    = 8;
        VirtualSerial_CDC_Interface.State.LineEncoding.BaudRateBPS = 9600;
        VirtualSerial_CDC_Interface.State.LineEncoding.CharFormat  = CDC_LINEENCODING_OneStopBit;
        VirtualSerial_CDC_Interface.State.LineEncoding.ParityType  = CDC_PARITY_None;
        VirtualSerial_CDC_Interface.State.LineEncoding.DataBits    = 8;

-       
+

        if (CDC_Host_SetLineEncoding(&VirtualSerial_CDC_Interface))
        {
                puts_P(PSTR("Error Setting Device Line Encoding.\r\n"));
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
        if (CDC_Host_SetLineEncoding(&VirtualSerial_CDC_Interface))
        {
                puts_P(PSTR("Error Setting Device Line Encoding.\r\n"));
                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-               return; 
+               return;

        }
 
        puts_P(PSTR("CDC Device Enumerated.\r\n"));
        }
 
        puts_P(PSTR("CDC Device Enumerated.\r\n"));