X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/fa3135d48530930aefd5ef4ca9d0def3faae474d..f4f44f9fc11d0ee9e0dbaf3323d095af32e8b0ef:/Projects/Webserver/Lib/HTTPServerApp.h

diff --git a/Projects/Webserver/Lib/HTTPServerApp.h b/Projects/Webserver/Lib/HTTPServerApp.h
index 7a4c87374..13399b0f9 100644
--- a/Projects/Webserver/Lib/HTTPServerApp.h
+++ b/Projects/Webserver/Lib/HTTPServerApp.h
@@ -39,9 +39,6 @@
 	/* Includes: */
 		#include <avr/pgmspace.h>
 		#include <string.h>
-		#include <ctype.h>
-		
-		#include <LUFA/Version.h>
 		
 		#include <uip.h>
 		#include <ff.h>
@@ -50,11 +47,12 @@
 		/** States for each HTTP connection to the webserver. */
 		enum Webserver_States_t
 		{
-			WEBSERVER_STATE_OpenRequestedFile, /** Currently opening requested file */
+			WEBSERVER_STATE_OpenRequestedFile, /**< Currently opening requested file */
 			WEBSERVER_STATE_SendResponseHeader, /**< Currently sending HTTP response headers to the client */
 			WEBSERVER_STATE_SendMIMETypeHeader, /**< Currently sending HTTP MIME type header to the client */
-			WEBSERVER_STATE_SendData,    /**< Currently sending HTTP page data to the client */
-			WEBSERVER_STATE_Closed,      /**< Connection closed after all data sent */
+			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: */
@@ -70,7 +68,14 @@
 		#define HTTP_SERVER_PORT  80
 
 	/* Function Prototypes: */
-		void WebserverApp_Init(void);
-		void WebserverApp_Callback(void);
+		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_SendMIMETypeHeader(void);
+			static void HTTPServerApp_SendData(void);
+		#endif
 		
 #endif