Add new tag for the LUFA-120219-BETA release.

[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 d77dc4a..0b6c19f 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
+++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowContent.c
@@ -1,76 +1,79 @@
-/*\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
-#define  INCLUDE_FROM_SIDESHOWCONTENT_C\r
-#include "SideshowContent.h"\r
-\r
-bool SideShow_AddSimpleContent(SideShow_PacketHeader_t* const PacketHeader, SideShow_Application_t* const Application)\r
-{\r
-       uint32_t ContentSize;\r
-       uint32_t ContentID;\r
-               \r
-       Endpoint_Read_Stream_LE(&ContentID, sizeof(uint32_t));\r
-\r
-       PacketHeader->Length -= sizeof(uint32_t);\r
-\r
-       if (Application->CurrentContentID != ContentID)\r
-       {\r
-               Endpoint_Discard_Stream(PacketHeader->Length);\r
-\r
-               return false;\r
-       }\r
-       \r
-       Endpoint_Read_Stream_LE(&ContentSize, sizeof(uint32_t));\r
-       Endpoint_Read_Stream_LE(&Application->CurrentContent, sizeof(XML_START_TAG) - 1);\r
-       \r
-       PacketHeader->Length -= sizeof(uint32_t) + (sizeof(XML_START_TAG) - 1);\r
-\r
-       if (!(memcmp(&Application->CurrentContent, XML_START_TAG, (sizeof(XML_START_TAG) - 1))))\r
-       {\r
-               SideShow_ProcessXMLContent(&Application->CurrentContent, (ContentSize - (sizeof(XML_END_TAG) - 1)));\r
-               \r
-               Endpoint_Discard_Stream(sizeof(XML_END_TAG) - 1);\r
-\r
-               Application->HaveContent = true;\r
-       }\r
-       else\r
-       {\r
-               printf(" BINARY");\r
-               Endpoint_Discard_Stream(ContentSize);\r
-       }\r
-       \r
-       return true;\r
-}\r
-\r
-static void SideShow_ProcessXMLContent(void* ContentData, uint32_t ContentSize)\r
-{\r
-       printf(" XML");\r
-       Endpoint_Discard_Stream(ContentSize);\r
-}\r
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2012.
+
+  dean [at] fourwalledcubicle [dot] com
+           www.lufa-lib.org
+*/
+
+/*
+  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
+  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.
+*/
+
+#define  INCLUDE_FROM_SIDESHOWCONTENT_C
+#include "SideshowContent.h"
+
+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), NULL);
+
+       PacketHeader->Length -= sizeof(uint32_t);
+
+       if (Application->CurrentContentID != ContentID)
+       {
+               Endpoint_Discard_Stream(PacketHeader->Length, NULL);
+
+               return false;
+       }
+
+       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), NULL);
+
+               Application->HaveContent = true;
+       }
+       else
+       {
+               printf(" BINARY");
+               Endpoint_Discard_Stream(ContentSize, NULL);
+       }
+
+       return true;
+}
+
+static void SideShow_ProcessXMLContent(void* ContentData,
+                                       uint32_t ContentSize)
+{
+       printf(" XML");
+       Endpoint_Discard_Stream(ContentSize, NULL);
+}
+