X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/97f7cd947be1469c223d09b2e6573051f6629cee..c58c53dba90fdc19d38f5e5d6957f2ede2a740f3:/Projects/Webserver/Lib/HTTPServerApp.h

diff --git a/Projects/Webserver/Lib/HTTPServerApp.h b/Projects/Webserver/Lib/HTTPServerApp.h
index 1ab64b323..47b810845 100644
--- a/Projects/Webserver/Lib/HTTPServerApp.h
+++ b/Projects/Webserver/Lib/HTTPServerApp.h
@@ -40,6 +40,8 @@
 		#include <avr/pgmspace.h>
 		#include <string.h>
 		
+		#include <LUFA/Version.h>
+
 		#include <uip.h>
 		#include <ff.h>
 	
@@ -47,27 +49,33 @@
 		/** 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: */
 		/** Type define for a MIME type handler. */
 		typedef struct
 		{
-			char Extension[4]; /**< 3 or less character file extension */
-			char MIMEType[30]; /**< Appropriate MIME type to send when the extension is encountered */
+			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 incomming HTTP traffic */
+		/** TCP listen port for incoming HTTP traffic */
 		#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_SendData(void);
+		#endif
 		
 #endif