Commit 08e8d639 authored by Dean Camera's avatar Dean Camera
Browse files

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

Exclude FATFs from the Webserver project documentation. Rename the functions in the HTTPServerApp.c/.h files so that they use the correct "HTTPServerApp_" prefix, and not "Webserver_".
parent a96d77ec
...@@ -629,7 +629,7 @@ EXCLUDE_SYMLINKS = NO ...@@ -629,7 +629,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories # against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/* # for example use the pattern */test/*
EXCLUDE_PATTERNS = */uip/* EXCLUDE_PATTERNS = */uip/* */FATFs/*
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
# (namespaces, classes, functions, etc.) that should be excluded from the # (namespaces, classes, functions, etc.) that should be excluded from the
......
...@@ -79,7 +79,7 @@ FATFS DiskFATState; ...@@ -79,7 +79,7 @@ FATFS DiskFATState;
/** Initialization function for the simple HTTP webserver. */ /** Initialization function for the simple HTTP webserver. */
void WebserverApp_Init(void) void HTTPServerApp_Init(void)
{ {
/* Listen on port 80 for HTTP connections from hosts */ /* Listen on port 80 for HTTP connections from hosts */
uip_listen(HTONS(HTTP_SERVER_PORT)); uip_listen(HTONS(HTTP_SERVER_PORT));
...@@ -91,7 +91,7 @@ void WebserverApp_Init(void) ...@@ -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 /** uIP stack application callback for the simple HTTP webserver. This function must be called each time the
* TCP/IP stack needs a TCP packet to be processed. * TCP/IP stack needs a TCP packet to be processed.
*/ */
void WebserverApp_Callback(void) void HTTPServerApp_Callback(void)
{ {
uip_tcp_appstate_t* const AppState = &uip_conn->appstate; uip_tcp_appstate_t* const AppState = &uip_conn->appstate;
...@@ -130,16 +130,16 @@ void WebserverApp_Callback(void) ...@@ -130,16 +130,16 @@ void WebserverApp_Callback(void)
switch (AppState->CurrentState) switch (AppState->CurrentState)
{ {
case WEBSERVER_STATE_OpenRequestedFile: case WEBSERVER_STATE_OpenRequestedFile:
Webserver_OpenRequestedFile(); HTTPServerApp_OpenRequestedFile();
break; break;
case WEBSERVER_STATE_SendResponseHeader: case WEBSERVER_STATE_SendResponseHeader:
Webserver_SendResponseHeader(); HTTPServerApp_SendResponseHeader();
break; break;
case WEBSERVER_STATE_SendMIMETypeHeader: case WEBSERVER_STATE_SendMIMETypeHeader:
Webserver_SendMIMETypeHeader(); HTTPServerApp_SendMIMETypeHeader();
break; break;
case WEBSERVER_STATE_SendData: case WEBSERVER_STATE_SendData:
Webserver_SendData(); HTTPServerApp_SendData();
break; break;
case WEBSERVER_STATE_Closing: case WEBSERVER_STATE_Closing:
uip_close(); uip_close();
...@@ -153,7 +153,7 @@ void WebserverApp_Callback(void) ...@@ -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 /** HTTP Server State handler for the Request Process state. This state manages the processing of incomming HTTP
* GET requests to the server from the receiving HTTP client. * GET requests to the server from the receiving HTTP client.
*/ */
static void Webserver_OpenRequestedFile(void) static void HTTPServerApp_OpenRequestedFile(void)
{ {
uip_tcp_appstate_t* const AppState = &uip_conn->appstate; uip_tcp_appstate_t* const AppState = &uip_conn->appstate;
char* const AppData = (char*)uip_appdata; char* const AppData = (char*)uip_appdata;
...@@ -193,7 +193,7 @@ static void Webserver_OpenRequestedFile(void) ...@@ -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 /** HTTP Server State handler for the HTTP Response Header Send state. This state manages the transmission of
* the HTTP response header to the receiving HTTP client. * the HTTP response header to the receiving HTTP client.
*/ */
static void Webserver_SendResponseHeader(void) static void HTTPServerApp_SendResponseHeader(void)
{ {
uip_tcp_appstate_t* const AppState = &uip_conn->appstate; uip_tcp_appstate_t* const AppState = &uip_conn->appstate;
char* const AppData = (char*)uip_appdata; char* const AppData = (char*)uip_appdata;
...@@ -222,7 +222,7 @@ static void Webserver_SendResponseHeader(void) ...@@ -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 /** HTTP Server State handler for the MIME Header Send state. This state manages the transmission of the file
* MIME type header for the requested file to the receiving HTTP client. * MIME type header for the requested file to the receiving HTTP client.
*/ */
static void Webserver_SendMIMETypeHeader(void) static void HTTPServerApp_SendMIMETypeHeader(void)
{ {
uip_tcp_appstate_t* const AppState = &uip_conn->appstate; uip_tcp_appstate_t* const AppState = &uip_conn->appstate;
char* const AppData = (char*)uip_appdata; char* const AppData = (char*)uip_appdata;
...@@ -267,7 +267,7 @@ static void Webserver_SendMIMETypeHeader(void) ...@@ -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 /** HTTP Server State handler for the Data Send state. This state manages the transmission of file chunks
* to the receiving HTTP client. * to the receiving HTTP client.
*/ */
static void Webserver_SendData(void) static void HTTPServerApp_SendData(void)
{ {
uip_tcp_appstate_t* const AppState = &uip_conn->appstate; uip_tcp_appstate_t* const AppState = &uip_conn->appstate;
char* const AppData = (char*)uip_appdata; char* const AppData = (char*)uip_appdata;
......
...@@ -68,14 +68,14 @@ ...@@ -68,14 +68,14 @@
#define HTTP_SERVER_PORT 80 #define HTTP_SERVER_PORT 80
/* Function Prototypes: */ /* Function Prototypes: */
void WebserverApp_Init(void); void HTTPServerApp_Init(void);
void WebserverApp_Callback(void); void HTTPServerApp_Callback(void);
#if defined(INCLUDE_FROM_HTTPSERVERAPP_C) #if defined(INCLUDE_FROM_HTTPSERVERAPP_C)
static void Webserver_OpenRequestedFile(void); static void HTTPServerApp_OpenRequestedFile(void);
static void Webserver_SendResponseHeader(void); static void HTTPServerApp_SendResponseHeader(void);
static void Webserver_SendMIMETypeHeader(void); static void HTTPServerApp_SendMIMETypeHeader(void);
static void Webserver_SendData(void); static void HTTPServerApp_SendData(void);
#endif #endif
#endif #endif
...@@ -75,7 +75,7 @@ void uIPManagement_Init(void) ...@@ -75,7 +75,7 @@ void uIPManagement_Init(void)
uip_setethaddr(MACAddress); uip_setethaddr(MACAddress);
/* HTTP Webserver Initialization */ /* HTTP Webserver Initialization */
WebserverApp_Init(); HTTPServerApp_Init();
} }
/** uIP Management function. This function manages the uIP stack when called while an RNDIS device has been /** uIP Management function. This function manages the uIP stack when called while an RNDIS device has been
......
...@@ -149,7 +149,7 @@ uip_arp_init(void) ...@@ -149,7 +149,7 @@ uip_arp_init(void)
void void
uip_arp_timer(void) uip_arp_timer(void)
{ {
struct arp_entry *tabptr; struct arp_entry *tabptr = NULL;
++arptime; ++arptime;
for(i = 0; i < UIP_ARPTAB_SIZE; ++i) { for(i = 0; i < UIP_ARPTAB_SIZE; ++i) {
...@@ -165,7 +165,7 @@ uip_arp_timer(void) ...@@ -165,7 +165,7 @@ uip_arp_timer(void)
static void static void
uip_arp_update(uip_ipaddr_t *ipaddr, struct uip_eth_addr *ethaddr) 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 /* Walk through the ARP mapping table and try to find an entry to
update. If none is found, the IP -> MAC address mapping is update. If none is found, the IP -> MAC address mapping is
inserted in the ARP table. */ inserted in the ARP table. */
...@@ -282,7 +282,6 @@ uip_arp_ipin(void) ...@@ -282,7 +282,6 @@ uip_arp_ipin(void)
void void
uip_arp_arpin(void) uip_arp_arpin(void)
{ {
if(uip_len < sizeof(struct arp_hdr)) { if(uip_len < sizeof(struct arp_hdr)) {
uip_len = 0; uip_len = 0;
return; return;
...@@ -362,7 +361,7 @@ uip_arp_arpin(void) ...@@ -362,7 +361,7 @@ uip_arp_arpin(void)
void void
uip_arp_out(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 /* Find the destination IP address in the ARP table and construct
the Ethernet header. If the destination IP addres isn't on the the Ethernet header. If the destination IP addres isn't on the
......
...@@ -12,9 +12,6 @@ ...@@ -12,9 +12,6 @@
* should be tweaked to match each specific project. The uIP * should be tweaked to match each specific project. The uIP
* distribution contains a documented example "uipopt.h" that can be * distribution contains a documented example "uipopt.h" that can be
* copied and modified for each project. * 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; ...@@ -657,8 +654,8 @@ typedef uint32_t uip_stats_t;
typedef struct httpd_state uip_tcp_appstate_t typedef struct httpd_state uip_tcp_appstate_t
\endcode \endcode
*/ */
#define UIP_UDP_APPCALL DHCPApp_Callback #define UIP_UDP_APPCALL DHCPApp_Callback
void UIP_UDP_APPCALL(void); void UIP_UDP_APPCALL(void);
/** /**
* \var #define UIP_APPCALL * \var #define UIP_APPCALL
...@@ -667,8 +664,8 @@ typedef uint32_t uip_stats_t; ...@@ -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 #define UIP_APPCALL HTTPServerApp_Callback
void UIP_APPCALL(void); 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; ...@@ -677,17 +674,17 @@ typedef uint32_t uip_stats_t;
* uip_conn structure. This usually is typedef:ed to a struct holding * uip_conn structure. This usually is typedef:ed to a struct holding
* application state information. * application state information.
*/ */
typedef struct typedef struct
{ {
uint8_t CurrentState; uint8_t CurrentState;
uint8_t NextState; uint8_t NextState;
char FileName[30]; char FileName[30];
FIL FileHandle; FIL FileHandle;
bool FileOpen; bool FileOpen;
uint32_t ACKedFilePos; uint32_t ACKedFilePos;
uint16_t SentChunkSize; uint16_t SentChunkSize;
} uip_tcp_appstate_t; } 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; ...@@ -696,19 +693,19 @@ typedef uint32_t uip_stats_t;
* uip_conn structure. This usually is typedef:ed to a struct holding * uip_conn structure. This usually is typedef:ed to a struct holding
* application state information. * application state information.
*/ */
typedef struct typedef struct
{
uint8_t CurrentState;
struct uip_udp_conn* Connection;
struct
{ {
uint8_t CurrentState; uint8_t AllocatedIP[4];
struct uip_udp_conn* Connection; uint8_t Netmask[4];
uint8_t GatewayIP[4];
struct uint8_t ServerIP[4];
{ } DHCPOffer_Data;
uint8_t AllocatedIP[4]; } uip_udp_appstate_t;
uint8_t Netmask[4];
uint8_t GatewayIP[4];
uint8_t ServerIP[4];
} DHCPOffer_Data;
} uip_udp_appstate_t;
/** @} */ /** @} */
#endif /* __UIPOPT_H__ */ #endif /* __UIPOPT_H__ */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment