Re-add Webserver uIP application polling, apply patch to uIP by Andrew Ruder to fix...

[pub/USBasp.git] / Projects / Webserver / Lib / HTTPServerApp.h

diff --git a/Projects/Webserver/Lib/HTTPServerApp.h b/Projects/Webserver/Lib/HTTPServerApp.h
index 1ab64b3..13399b0 100644 (file)
--- a/Projects/Webserver/Lib/HTTPServerApp.h
+++ b/Projects/Webserver/Lib/HTTPServerApp.h
@@ -47,11 +47,12 @@
                /** States for each HTTP connection to the webserver. */\r
                enum Webserver_States_t\r
                {\r
-                       WEBSERVER_STATE_OpenRequestedFile, /** Currently opening requested file */\r
+                       WEBSERVER_STATE_OpenRequestedFile, /**< Currently opening requested file */\r
                        WEBSERVER_STATE_SendResponseHeader, /**< Currently sending HTTP response headers to the client */\r
                        WEBSERVER_STATE_SendMIMETypeHeader, /**< Currently sending HTTP MIME type header to the client */\r
-                       WEBSERVER_STATE_SendData,    /**< Currently sending HTTP page data to the client */\r
-                       WEBSERVER_STATE_Closed,      /**< Connection closed after all data sent */\r
+                       WEBSERVER_STATE_SendData, /**< Currently sending HTTP page data to the client */\r
+                       WEBSERVER_STATE_Closing, /**< Ready to close the connection to the client */\r
+                       WEBSERVER_STATE_Closed, /**< Connection closed after all data sent */\r
                };\r
                \r
        /* Type Defines: */\r
@@ -67,7 +68,14 @@
                #define HTTP_SERVER_PORT  80\r
 \r
        /* Function Prototypes: */\r
-               void WebserverApp_Init(void);\r
-               void WebserverApp_Callback(void);\r
+               void HTTPServerApp_Init(void);\r
+               void HTTPServerApp_Callback(void);\r
+               \r
+               #if defined(INCLUDE_FROM_HTTPSERVERAPP_C)\r
+                       static void HTTPServerApp_OpenRequestedFile(void);\r
+                       static void HTTPServerApp_SendResponseHeader(void);\r
+                       static void HTTPServerApp_SendMIMETypeHeader(void);\r
+                       static void HTTPServerApp_SendData(void);\r
+               #endif\r
                \r
 #endif\r