Exclude FATFs from the Webserver project documentation. Rename the functions in the...

diff --git a/Projects/Webserver/Doxygen.conf b/Projects/Webserver/Doxygen.conf
index c9333f3..7117920 100644 (file)
--- a/Projects/Webserver/Doxygen.conf
+++ b/Projects/Webserver/Doxygen.conf
@@ -629,7 +629,7 @@ EXCLUDE_SYMLINKS       = NO
 # against the file with absolute path, so to exclude all test directories\r
 # for example use the pattern */test/*\r
 \r
 # against the file with absolute path, so to exclude all test directories\r
 # for example use the pattern */test/*\r
 \r

-EXCLUDE_PATTERNS       = */uip/*\r
+EXCLUDE_PATTERNS       = */uip/* */FATFs/* \r

 \r
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names\r
 # (namespaces, classes, functions, etc.) that should be excluded from the\r
 \r
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names\r
 # (namespaces, classes, functions, etc.) that should be excluded from the\r

diff --git a/Projects/Webserver/Lib/HTTPServerApp.c b/Projects/Webserver/Lib/HTTPServerApp.c
index 4c12271..1836688 100644 (file)
--- a/Projects/Webserver/Lib/HTTPServerApp.c
+++ b/Projects/Webserver/Lib/HTTPServerApp.c
@@ -79,7 +79,7 @@ FATFS DiskFATState;
 \r
 \r
 /** Initialization function for the simple HTTP webserver. */\r
 \r
 \r
 /** Initialization function for the simple HTTP webserver. */\r

-void WebserverApp_Init(void)\r
+void HTTPServerApp_Init(void)\r

 {\r
        /* Listen on port 80 for HTTP connections from hosts */\r
        uip_listen(HTONS(HTTP_SERVER_PORT));\r
 {\r
        /* Listen on port 80 for HTTP connections from hosts */\r
        uip_listen(HTONS(HTTP_SERVER_PORT));\r


@@ -91,7 +91,7 @@ void WebserverApp_Init(void)
 /** uIP stack application callback for the simple HTTP webserver. This function must be called each time the\r
  *  TCP/IP stack needs a TCP packet to be processed.\r
  */\r
 /** uIP stack application callback for the simple HTTP webserver. This function must be called each time the\r
  *  TCP/IP stack needs a TCP packet to be processed.\r
  */\r

-void WebserverApp_Callback(void)\r
+void HTTPServerApp_Callback(void)\r

 {\r
        uip_tcp_appstate_t* const AppState = &uip_conn->appstate;\r
 \r
 {\r
        uip_tcp_appstate_t* const AppState = &uip_conn->appstate;\r
 \r


@@ -130,16 +130,16 @@ void WebserverApp_Callback(void)
                switch (AppState->CurrentState)\r
                {\r
                        case WEBSERVER_STATE_OpenRequestedFile:\r
                switch (AppState->CurrentState)\r
                {\r
                        case WEBSERVER_STATE_OpenRequestedFile:\r

-                               Webserver_OpenRequestedFile();\r
+                               HTTPServerApp_OpenRequestedFile();\r

                                break;\r
                        case WEBSERVER_STATE_SendResponseHeader:\r
                                break;\r
                        case WEBSERVER_STATE_SendResponseHeader:\r

-                               Webserver_SendResponseHeader();\r
+                               HTTPServerApp_SendResponseHeader();\r

                                break;\r
                        case WEBSERVER_STATE_SendMIMETypeHeader:\r
                                break;\r
                        case WEBSERVER_STATE_SendMIMETypeHeader:\r

-                               Webserver_SendMIMETypeHeader(); \r
+                               HTTPServerApp_SendMIMETypeHeader();     \r

                                break;\r
                        case WEBSERVER_STATE_SendData:\r
                                break;\r
                        case WEBSERVER_STATE_SendData:\r

-                               Webserver_SendData();\r
+                               HTTPServerApp_SendData();\r

                                break;\r
                        case WEBSERVER_STATE_Closing:\r
                                uip_close();\r
                                break;\r
                        case WEBSERVER_STATE_Closing:\r
                                uip_close();\r


@@ -153,7 +153,7 @@ void WebserverApp_Callback(void)
 /** HTTP Server State handler for the Request Process state. This state manages the processing of incomming HTTP\r
  *  GET requests to the server from the receiving HTTP client.\r
  */\r
 /** HTTP Server State handler for the Request Process state. This state manages the processing of incomming HTTP\r
  *  GET requests to the server from the receiving HTTP client.\r
  */\r

-static void Webserver_OpenRequestedFile(void)\r
+static void HTTPServerApp_OpenRequestedFile(void)\r

 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r
 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r


@@ -193,7 +193,7 @@ static void Webserver_OpenRequestedFile(void)
 /** HTTP Server State handler for the HTTP Response Header Send state. This state manages the transmission of\r
  *  the HTTP response header to the receiving HTTP client.\r
  */\r
 /** HTTP Server State handler for the HTTP Response Header Send state. This state manages the transmission of\r
  *  the HTTP response header to the receiving HTTP client.\r
  */\r

-static void Webserver_SendResponseHeader(void)\r
+static void HTTPServerApp_SendResponseHeader(void)\r

 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r
 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r


@@ -222,7 +222,7 @@ static void Webserver_SendResponseHeader(void)
 /** HTTP Server State handler for the MIME Header Send state. This state manages the transmission of the file\r
  *  MIME type header for the requested file to the receiving HTTP client.\r
  */\r
 /** HTTP Server State handler for the MIME Header Send state. This state manages the transmission of the file\r
  *  MIME type header for the requested file to the receiving HTTP client.\r
  */\r

-static void Webserver_SendMIMETypeHeader(void)\r
+static void HTTPServerApp_SendMIMETypeHeader(void)\r

 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r
 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r


@@ -267,7 +267,7 @@ static void Webserver_SendMIMETypeHeader(void)
 /** HTTP Server State handler for the Data Send state. This state manages the transmission of file chunks\r
  *  to the receiving HTTP client.\r
  */\r
 /** HTTP Server State handler for the Data Send state. This state manages the transmission of file chunks\r
  *  to the receiving HTTP client.\r
  */\r

-static void Webserver_SendData(void)\r
+static void HTTPServerApp_SendData(void)\r

 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r
 {\r
        uip_tcp_appstate_t* const AppState    = &uip_conn->appstate;\r
        char*               const AppData     = (char*)uip_appdata;\r

diff --git a/Projects/Webserver/Lib/HTTPServerApp.h b/Projects/Webserver/Lib/HTTPServerApp.h
index 91956ce..43ad5b1 100644 (file)
--- a/Projects/Webserver/Lib/HTTPServerApp.h
+++ b/Projects/Webserver/Lib/HTTPServerApp.h
@@ -68,14 +68,14 @@
                #define HTTP_SERVER_PORT  80\r
 \r
        /* Function Prototypes: */\r
                #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
                \r
                #if defined(INCLUDE_FROM_HTTPSERVERAPP_C)\r

-                       static void Webserver_OpenRequestedFile(void);\r
-                       static void Webserver_SendResponseHeader(void);\r
-                       static void Webserver_SendMIMETypeHeader(void);\r
-                       static void Webserver_SendData(void);\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
                #endif\r
                \r
 #endif\r

diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c
index c08b273..e207d9c 100644 (file)
--- a/Projects/Webserver/Lib/uIPManagement.c
+++ b/Projects/Webserver/Lib/uIPManagement.c
@@ -75,7 +75,7 @@ void uIPManagement_Init(void)
        uip_setethaddr(MACAddress);\r
        \r
        /* HTTP Webserver Initialization */\r
        uip_setethaddr(MACAddress);\r
        \r
        /* HTTP Webserver Initialization */\r

-       WebserverApp_Init();\r
+       HTTPServerApp_Init();\r

 }\r
 \r
 /** uIP Management function. This function manages the uIP stack when called while an RNDIS device has been\r
 }\r
 \r
 /** uIP Management function. This function manages the uIP stack when called while an RNDIS device has been\r

diff --git a/Projects/Webserver/Lib/uip/uip_arp.c b/Projects/Webserver/Lib/uip/uip_arp.c
index dc21cc0..56dff9c 100644 (file)
--- a/Projects/Webserver/Lib/uip/uip_arp.c
+++ b/Projects/Webserver/Lib/uip/uip_arp.c
@@ -149,7 +149,7 @@ uip_arp_init(void)
 void
 uip_arp_timer(void)
 {
 void
 uip_arp_timer(void)
 {

-  struct arp_entry *tabptr;
+  struct arp_entry *tabptr = NULL;

   
   ++arptime;
   for(i = 0; i < UIP_ARPTAB_SIZE; ++i) {
   
   ++arptime;
   for(i = 0; i < UIP_ARPTAB_SIZE; ++i) {


@@ -165,7 +165,7 @@ uip_arp_timer(void)
 static void
 uip_arp_update(uip_ipaddr_t *ipaddr, struct uip_eth_addr *ethaddr)
 {
 static void
 uip_arp_update(uip_ipaddr_t *ipaddr, struct uip_eth_addr *ethaddr)
 {

-  register struct arp_entry *tabptr;
+  register struct arp_entry *tabptr = NULL;

   /* Walk through the ARP mapping table and try to find an entry to
      update. If none is found, the IP -> MAC address mapping is
      inserted in the ARP table. */
   /* Walk through the ARP mapping table and try to find an entry to
      update. If none is found, the IP -> MAC address mapping is
      inserted in the ARP table. */


@@ -282,7 +282,6 @@ uip_arp_ipin(void)
 void
 uip_arp_arpin(void)
 {
 void
 uip_arp_arpin(void)
 {

-  

   if(uip_len < sizeof(struct arp_hdr)) {
     uip_len = 0;
     return;
   if(uip_len < sizeof(struct arp_hdr)) {
     uip_len = 0;
     return;


@@ -362,7 +361,7 @@ uip_arp_arpin(void)
 void
 uip_arp_out(void)
 {
 void
 uip_arp_out(void)
 {

-  struct arp_entry *tabptr;
+  struct arp_entry *tabptr = NULL;

   
   /* Find the destination IP address in the ARP table and construct
      the Ethernet header. If the destination IP addres isn't on the
   
   /* Find the destination IP address in the ARP table and construct
      the Ethernet header. If the destination IP addres isn't on the

diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h
index a8224d4..23bce28 100644 (file)
--- a/Projects/Webserver/Lib/uip/uipopt.h
+++ b/Projects/Webserver/Lib/uip/uipopt.h
@@ -12,9 +12,6 @@
  * should be tweaked to match each specific project. The uIP
  * distribution contains a documented example "uipopt.h" that can be
  * copied and modified for each project.
  * should be tweaked to match each specific project. The uIP
  * distribution contains a documented example "uipopt.h" that can be
  * copied and modified for each project.

- *
- * \note Contiki does not use the uipopt.h file to configure uIP, but
- * uses a per-port uip-conf.h file that should be edited instead.

  */
 
 /**
  */
 
 /**


@@ -657,8 +654,8 @@ typedef uint32_t uip_stats_t;
  typedef struct httpd_state uip_tcp_appstate_t
  \endcode
 */
  typedef struct httpd_state uip_tcp_appstate_t
  \endcode
 */

-       #define UIP_UDP_APPCALL DHCPApp_Callback
-       void UIP_UDP_APPCALL(void);
+#define UIP_UDP_APPCALL DHCPApp_Callback
+void UIP_UDP_APPCALL(void);

 
 /**
  * \var #define UIP_APPCALL
 
 /**
  * \var #define UIP_APPCALL


@@ -667,8 +664,8 @@ typedef uint32_t uip_stats_t;
  * response to TCP/IP events.
  *
  */
  * response to TCP/IP events.
  *
  */

-       #define UIP_APPCALL     WebserverApp_Callback
-       void UIP_APPCALL(void);
+#define UIP_APPCALL     HTTPServerApp_Callback
+void UIP_APPCALL(void);

 
 /**
  * \var typedef uip_tcp_appstate_t
 
 /**
  * \var typedef uip_tcp_appstate_t


@@ -677,17 +674,17 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */

-       typedef struct
-       {
-               uint8_t  CurrentState;
-               uint8_t  NextState;
-               
-               char     FileName[30];
-               FIL      FileHandle;
-               bool     FileOpen;
-               uint32_t ACKedFilePos;
-               uint16_t SentChunkSize;
-       } uip_tcp_appstate_t;
+typedef struct
+{
+       uint8_t  CurrentState;
+       uint8_t  NextState;
+       
+       char     FileName[30];
+       FIL      FileHandle;
+       bool     FileOpen;
+       uint32_t ACKedFilePos;
+       uint16_t SentChunkSize;
+} uip_tcp_appstate_t;

 
 /**
  * \var typedef uip_udp_appstate_t
 
 /**
  * \var typedef uip_udp_appstate_t


@@ -696,19 +693,19 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */

-       typedef struct
+typedef struct
+{
+       uint8_t CurrentState;
+       struct  uip_udp_conn* Connection;
+       
+       struct

        {
        {

-               uint8_t CurrentState;
-               struct  uip_udp_conn* Connection;
-               
-               struct
-               {
-                       uint8_t AllocatedIP[4];
-                       uint8_t Netmask[4];
-                       uint8_t GatewayIP[4];
-                       uint8_t ServerIP[4];
-               } DHCPOffer_Data;
-       } uip_udp_appstate_t;
+               uint8_t AllocatedIP[4];
+               uint8_t Netmask[4];
+               uint8_t GatewayIP[4];
+               uint8_t ServerIP[4];
+       } DHCPOffer_Data;
+} uip_udp_appstate_t;

 /** @} */
 
 #endif /* __UIPOPT_H__ */
 /** @} */
 
 #endif /* __UIPOPT_H__ */