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

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

diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
index 0d1dd80..0b6c19f 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
+++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
-              
+     Copyright (C) Dean Camera, 2012.
+
   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 
+  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
@@ -31,46 +31,49 @@
 #define  INCLUDE_FROM_SIDESHOWCONTENT_C
 #include "SideshowContent.h"
 
-bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, SideShow_Application_t* const Application)
+bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader,
+                               SideShow_Application_t* const Application)
 {
        uint32_t ContentSize;
        uint32_t ContentID;
-               
-       Endpoint_Read_Stream_LE(&ContentID, sizeof(uint32_t));
+
+       Endpoint_Read_Stream_LE(&ContentID, sizeof(uint32_t), NULL);
 
        PacketHeader->Length -= sizeof(uint32_t);
 
        if (Application->CurrentContentID != ContentID)
        {
-               Endpoint_Discard_Stream(PacketHeader->Length);
+               Endpoint_Discard_Stream(PacketHeader->Length, NULL);
 
                return false;
        }
-       
-       Endpoint_Read_Stream_LE(&ContentSize, sizeof(uint32_t));
-       Endpoint_Read_Stream_LE(&Application->CurrentContent, sizeof(XML_START_TAG) - 1);
-       
+
+       Endpoint_Read_Stream_LE(&ContentSize, sizeof(uint32_t), NULL);
+       Endpoint_Read_Stream_LE(&Application->CurrentContent, (sizeof(XML_START_TAG) - 1), NULL);
+
        PacketHeader->Length -= sizeof(uint32_t) + (sizeof(XML_START_TAG) - 1);
 
        if (!(memcmp(&Application->CurrentContent, XML_START_TAG, (sizeof(XML_START_TAG) - 1))))
        {
                SideShow_ProcessXMLContent(&Application->CurrentContent, (ContentSize - (sizeof(XML_END_TAG) - 1)));
-               
-               Endpoint_Discard_Stream(sizeof(XML_END_TAG) - 1);
+
+               Endpoint_Discard_Stream((sizeof(XML_END_TAG) - 1), NULL);
 
                Application->HaveContent = true;
        }
        else
        {
                printf(" BINARY");
-               Endpoint_Discard_Stream(ContentSize);
+               Endpoint_Discard_Stream(ContentSize, NULL);
        }
-       
+
        return true;
 }
 
-static void SideShow_ProcessXMLContent(void* ContentData, uint32_t ContentSize)
+static void SideShow_ProcessXMLContent(void* ContentData,
+                                       uint32_t ContentSize)
 {
        printf(" XML");
-       Endpoint_Discard_Stream(ContentSize);
+       Endpoint_Discard_Stream(ContentSize, NULL);
 }
+