Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter...

[pub/USBasp.git] / Demos / Device / Incomplete / Sideshow / Lib / SideshowCommon.c

diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c
index 9269115..982df29 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c
+++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c
@@ -1,70 +1,72 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2010.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\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
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-#include "SideshowCommon.h"\r
-\r
-uint16_t SideShow_Read_Unicode_String(void* UnicodeString, uint16_t MaxBytes)\r
-{\r
-       Unicode_String_t* UnicodeStruct = (Unicode_String_t*)UnicodeString;\r
-       uint32_t          UnicodeCharsToRead;\r
-       \r
-       Endpoint_Read_Stream_LE(&UnicodeCharsToRead, sizeof(uint32_t));\r
-       \r
-       int               UnicodeData[UnicodeCharsToRead];\r
-\r
-       UnicodeStruct->LengthInBytes = (UnicodeCharsToRead << 1);\r
-\r
-       Endpoint_Read_Stream_LE(&UnicodeData, UnicodeStruct->LengthInBytes);\r
-       \r
-       if (UnicodeStruct->LengthInBytes > MaxBytes)\r
-         UnicodeStruct->LengthInBytes = MaxBytes;\r
-         \r
-       memcpy(&UnicodeStruct->UnicodeString, &UnicodeData, UnicodeStruct->LengthInBytes);\r
-       \r
-       return ((UnicodeCharsToRead << 1) + sizeof(uint32_t));\r
-}\r
-\r
-void SideShow_Write_Unicode_String(void* UnicodeString)\r
-{\r
-       Unicode_String_t* UnicodeStruct = (Unicode_String_t*)UnicodeString;\r
-\r
-       uint32_t StringSizeInCharacters = (UnicodeStruct->LengthInBytes >> 1);\r
-\r
-       Endpoint_Write_Stream_LE(&StringSizeInCharacters, sizeof(uint32_t));\r
-       Endpoint_Write_Stream_LE(&UnicodeStruct->UnicodeString, UnicodeStruct->LengthInBytes);\r
-}\r
-\r
-void SideShow_Discard_Byte_Stream(void)\r
-{\r
-       uint32_t StreamSize;\r
-\r
-       Endpoint_Read_Stream_LE(&StreamSize, sizeof(uint32_t));\r
-       Endpoint_Discard_Stream(StreamSize);\r
-}\r
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2011.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  Copyright 2011  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
+  without fee, provided that the above copyright notice appear in
+  all copies and that both that the copyright notice and this
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+
+  The author disclaim 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
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "SideshowCommon.h"
+
+uint16_t SideShow_Read_Unicode_String(void* const UnicodeString,
+                                      const uint16_t MaxBytes)
+{
+       Unicode_String_t* const UnicodeStruct = (Unicode_String_t*)UnicodeString;
+       uint32_t                UnicodeCharsToRead;
+
+       Endpoint_Read_Stream_LE(&UnicodeCharsToRead, sizeof(uint32_t), NULL);
+
+       int UnicodeData[UnicodeCharsToRead];
+
+       UnicodeStruct->LengthInBytes = (UnicodeCharsToRead << 1);
+
+       Endpoint_Read_Stream_LE(&UnicodeData, UnicodeStruct->LengthInBytes, NULL);
+
+       if (UnicodeStruct->LengthInBytes > MaxBytes)
+         UnicodeStruct->LengthInBytes = MaxBytes;
+
+       memcpy(&UnicodeStruct->UnicodeString, &UnicodeData, UnicodeStruct->LengthInBytes);
+
+       return ((UnicodeCharsToRead << 1) + sizeof(uint32_t));
+}
+
+void SideShow_Write_Unicode_String(void* const UnicodeString)
+{
+       Unicode_String_t* const UnicodeStruct = (Unicode_String_t*)UnicodeString;
+
+       uint32_t StringSizeInCharacters = (UnicodeStruct->LengthInBytes >> 1);
+
+       Endpoint_Write_Stream_LE(&StringSizeInCharacters, sizeof(uint32_t), NULL);
+       Endpoint_Write_Stream_LE(&UnicodeStruct->UnicodeString, UnicodeStruct->LengthInBytes, NULL);
+}
+
+void SideShow_Discard_Byte_Stream(void)
+{
+       uint32_t StreamSize;
+
+       Endpoint_Read_Stream_LE(&StreamSize, sizeof(uint32_t), NULL);
+       Endpoint_Discard_Stream(StreamSize, NULL);
+}
+