Fix off-by-one in the VirtualFAT cluster chain generator.

[pub/lufa.git] / Demos / Device / ClassDriver / DualVirtualSerial / DualVirtualSerial.c

diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
index 3b7f26c..b7d0455 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/DualVirtualSerial.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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
@@ -18,7 +18,7 @@
   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
@@ -45,19 +45,25 @@ USB_ClassInfo_CDC_Device_t VirtualSerial1_CDC_Interface =
        {
                .Config =
                        {
-                               .ControlInterfaceNumber           = 0,
-
-                               .DataINEndpointNumber             = CDC1_TX_EPNUM,
-                               .DataINEndpointSize               = CDC_TXRX_EPSIZE,
-                               .DataINEndpointDoubleBank         = false,
-
-                               .DataOUTEndpointNumber            = CDC1_RX_EPNUM,
-                               .DataOUTEndpointSize              = CDC_TXRX_EPSIZE,
-                               .DataOUTEndpointDoubleBank        = false,
-
-                               .NotificationEndpointNumber       = CDC1_NOTIFICATION_EPNUM,
-                               .NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,
-                               .NotificationEndpointDoubleBank   = false,
+                               .ControlInterfaceNumber   = 0,
+                               .DataINEndpoint           =
+                                       {
+                                               .Address          = CDC1_TX_EPADDR,
+                                               .Size             = CDC_TXRX_EPSIZE,
+                                               .Banks            = 1,
+                                       },
+                               .DataOUTEndpoint =
+                                       {
+                                               .Address          = CDC1_RX_EPADDR,
+                                               .Size             = CDC_TXRX_EPSIZE,
+                                               .Banks            = 1,
+                                       },
+                               .NotificationEndpoint =
+                                       {
+                                               .Address          = CDC1_NOTIFICATION_EPADDR,
+                                               .Size             = CDC_NOTIFICATION_EPSIZE,
+                                               .Banks            = 1,
+                                       },
                        },
        };
 
@@ -70,22 +76,30 @@ USB_ClassInfo_CDC_Device_t VirtualSerial2_CDC_Interface =
        {
                .Config =
                        {
-                               .ControlInterfaceNumber           = 2,
+                               .ControlInterfaceNumber   = 2,
+                               .DataINEndpoint           =
+                                       {
+                                               .Address          = CDC2_TX_EPADDR,
+                                               .Size             = CDC_TXRX_EPSIZE,
+                                               .Banks            = 1,
+                                       },
+                               .DataOUTEndpoint =
+                                       {
+                                               .Address          = CDC2_RX_EPADDR,
+                                               .Size             = CDC_TXRX_EPSIZE,
+                                               .Banks            = 1,
+                                       },
+                               .NotificationEndpoint =
+                                       {
+                                               .Address          = CDC2_NOTIFICATION_EPADDR,
+                                               .Size             = CDC_NOTIFICATION_EPSIZE,
+                                               .Banks            = 1,
+                                       },
 
-                               .DataINEndpointNumber             = CDC2_TX_EPNUM,
-                               .DataINEndpointSize               = CDC_TXRX_EPSIZE,
-                               .DataINEndpointDoubleBank         = false,
-
-                               .DataOUTEndpointNumber            = CDC2_RX_EPNUM,
-                               .DataOUTEndpointSize              = CDC_TXRX_EPSIZE,
-                               .DataOUTEndpointDoubleBank        = false,
-
-                               .NotificationEndpointNumber       = CDC2_NOTIFICATION_EPNUM,
-                               .NotificationEndpointSize         = CDC_NOTIFICATION_EPSIZE,
-                               .NotificationEndpointDoubleBank   = false,
                        },
        };
 
+
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */
@@ -94,7 +108,7 @@ int main(void)
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
-       sei();
+       GlobalInterruptEnable();
 
        for (;;)
        {
@@ -156,7 +170,7 @@ void CheckJoystickMovement(void)
        {
                ActionSent = true;
 
-               CDC_Device_SendString(&VirtualSerial1_CDC_Interface, ReportString, strlen(ReportString));
+               CDC_Device_SendString(&VirtualSerial1_CDC_Interface, ReportString);
        }
 }