X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6bda628718f67c04ed43e8328f55bdce5319c504..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c?ds=sidebyside diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c index 02b681c50..982df292a 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c @@ -1,21 +1,21 @@ /* LUFA Library - Copyright (C) Dean Camera, 2010. - + Copyright (C) Dean Camera, 2011. + dean [at] fourwalledcubicle [dot] com - www.fourwalledcubicle.com + www.lufa-lib.org */ /* - Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + Copyright 2011 Dean Camera (dean [at] fourwalledcubicle [dot] com) - Permission to use, copy, modify, distribute, and sell this + 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 + 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 + 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 @@ -35,20 +35,20 @@ uint16_t SideShow_Read_Unicode_String(void* const UnicodeString, { Unicode_String_t* const UnicodeStruct = (Unicode_String_t*)UnicodeString; uint32_t UnicodeCharsToRead; - - Endpoint_Read_Stream_LE(&UnicodeCharsToRead, sizeof(uint32_t)); - + + Endpoint_Read_Stream_LE(&UnicodeCharsToRead, sizeof(uint32_t), NULL); + int UnicodeData[UnicodeCharsToRead]; UnicodeStruct->LengthInBytes = (UnicodeCharsToRead << 1); - Endpoint_Read_Stream_LE(&UnicodeData, UnicodeStruct->LengthInBytes); - + 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)); } @@ -58,14 +58,15 @@ void SideShow_Write_Unicode_String(void* const UnicodeString) uint32_t StringSizeInCharacters = (UnicodeStruct->LengthInBytes >> 1); - Endpoint_Write_Stream_LE(&StringSizeInCharacters, sizeof(uint32_t)); - Endpoint_Write_Stream_LE(&UnicodeStruct->UnicodeString, UnicodeStruct->LengthInBytes); + 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)); - Endpoint_Discard_Stream(StreamSize); + Endpoint_Read_Stream_LE(&StreamSize, sizeof(uint32_t), NULL); + Endpoint_Discard_Stream(StreamSize, NULL); } +