Use immediate variable expansion in the second-deepest level makefile scripts to...

[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 95d3ee1..f926d7a 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c
+++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowCommon.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  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


@@ -36,13 +36,13 @@ uint16_t SideShow_Read_Unicode_String(void* const UnicodeString,
        Unicode_String_t* const UnicodeStruct = (Unicode_String_t*)UnicodeString;
        uint32_t                UnicodeCharsToRead;
 
        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);
 
 
        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;
 
        if (UnicodeStruct->LengthInBytes > MaxBytes)
          UnicodeStruct->LengthInBytes = MaxBytes;


@@ -58,15 +58,15 @@ void SideShow_Write_Unicode_String(void* const UnicodeString)
 
        uint32_t StringSizeInCharacters = (UnicodeStruct->LengthInBytes >> 1);
 
 
        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;
 
 }
 
 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);

 }
 
 }