From cf4575b94a3c65e6535a159fc71fc885aebc2620 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 2 Aug 2019 14:02:40 -0700 Subject: Fix the LUFA lib to use a submodule instead of just files (#6245) * Remove LUFA files * Update descriptions for newer version of LUFA * Create PR6245.md * Fix CDC(Serial) type errors * Fix missed merge conflict for AUDIO_DTYPE_CSInterface --- lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h | 84 ------------------------- 1 file changed, 84 deletions(-) delete mode 100644 lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h (limited to 'lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h') diff --git a/lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h b/lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h deleted file mode 100644 index 11c39d87ed..0000000000 --- a/lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - LUFA Library - Copyright (C) Dean Camera, 2017. - - dean [at] fourwalledcubicle [dot] com - www.lufa-lib.org -*/ - -/* - Copyright 2017 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 disclaims 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. -*/ - -/** \file - * - * Header file for HTTPServerApp.c. - */ - -#ifndef _HTTPSERVER_APP_H_ -#define _HTTPSERVER_APP_H_ - - /* Includes: */ - #include - #include - - #include - - #include "Config/AppConfig.h" - - #include - #include - - /* Enums: */ - /** States for each HTTP connection to the webserver. */ - enum Webserver_States_t - { - WEBSERVER_STATE_OpenRequestedFile, /**< Currently opening requested file */ - WEBSERVER_STATE_SendResponseHeader, /**< Currently sending HTTP response headers to the client */ - WEBSERVER_STATE_SendData, /**< Currently sending HTTP page data to the client */ - WEBSERVER_STATE_Closing, /**< Ready to close the connection to the client */ - WEBSERVER_STATE_Closed, /**< Connection closed after all data sent */ - }; - - /* Type Defines: */ - /** Type define for a MIME type handler. */ - typedef struct - { - char* Extension; /**< File extension (no leading '.' character) */ - char* MIMEType; /**< Appropriate MIME type to send when the extension is encountered */ - } MIME_Type_t; - - /* Macros: */ - /** TCP listen port for incoming HTTP traffic. */ - #define HTTP_SERVER_PORT 80 - - /* Function Prototypes: */ - void HTTPServerApp_Init(void); - void HTTPServerApp_Callback(void); - - #if defined(INCLUDE_FROM_HTTPSERVERAPP_C) - static void HTTPServerApp_OpenRequestedFile(void); - static void HTTPServerApp_SendResponseHeader(void); - static void HTTPServerApp_SendData(void); - #endif - -#endif - -- cgit v1.2.3 From 39baa5e80da8f96b5455e160259523e0c2848a94 Mon Sep 17 00:00:00 2001 From: skullY Date: Fri, 2 Aug 2019 20:13:57 -0700 Subject: add lufa as a submodule --- lib/lufa | 1 + 1 file changed, 1 insertion(+) create mode 160000 lib/lufa (limited to 'lib/lufa/Projects/Webserver/Lib/HTTPServerApp.h') diff --git a/lib/lufa b/lib/lufa new file mode 160000 index 0000000000..ce10f7642b --- /dev/null +++ b/lib/lufa @@ -0,0 +1 @@ +Subproject commit ce10f7642b0459e409839b23cc91498945119b4d -- cgit v1.2.3