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 2e052af..0b6c19f 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
+++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] 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


@@ -37,19 +37,19 @@ bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader,
        uint32_t ContentSize;
        uint32_t ContentID;
 
        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)
        {
 
        PacketHeader->Length -= sizeof(uint32_t);
 
        if (Application->CurrentContentID != ContentID)
        {

-               Endpoint_Discard_Stream(PacketHeader->Length);
+               Endpoint_Discard_Stream(PacketHeader->Length, NULL);

 
                return false;
        }
 
 
                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);
 
 
        PacketHeader->Length -= sizeof(uint32_t) + (sizeof(XML_START_TAG) - 1);
 


@@ -57,14 +57,14 @@ bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader,
        {
                SideShow_ProcessXMLContent(&Application->CurrentContent, (ContentSize - (sizeof(XML_END_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");
 
                Application->HaveContent = true;
        }
        else
        {
                printf(" BINARY");

-               Endpoint_Discard_Stream(ContentSize);
+               Endpoint_Discard_Stream(ContentSize, NULL);

        }
 
        return true;
        }
 
        return true;


@@ -74,6 +74,6 @@ static void SideShow_ProcessXMLContent(void* ContentData,
                                        uint32_t ContentSize)
 {
        printf(" XML");
                                        uint32_t ContentSize)
 {
        printf(" XML");

-       Endpoint_Discard_Stream(ContentSize);
+       Endpoint_Discard_Stream(ContentSize, NULL);

 }
 
 }