forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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_".

Browse Source
pull/1469/head
Dean Camera 15 years ago
parent a96d77eca7
commit 08e8d6393e
6 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File

2
Projects/Webserver/Doxygen.conf
Unescape View File

@ -629,7 +629,7 @@ EXCLUDE_SYMLINKS = NO
# against the file with absolute path, so to exclude all test directories
# 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
# (namespaces, classes, functions, etc.) that should be excluded from the

20
Projects/Webserver/Lib/HTTPServerApp.c
Unescape View File

@ -79,7 +79,7 @@ FATFS DiskFATState;
/** Initialization function for the simple HTTP webserver. */
void WebserverApp_Init(void)
void HTTPServerApp_Init(void)
{
/* Listen on port 80 for HTTP connections from hosts */
uip_listen(HTONS(HTTP_SERVER_PORT));
@ -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
* 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;
@ -130,16 +130,16 @@ void WebserverApp_Callback(void)
switch (AppState->CurrentState)
{
case WEBSERVER_STATE_OpenRequestedFile:
Webserver_OpenRequestedFile();
HTTPServerApp_OpenRequestedFile();
break;
case WEBSERVER_STATE_SendResponseHeader:
Webserver_SendResponseHeader();
HTTPServerApp_SendResponseHeader();
break;
case WEBSERVER_STATE_SendMIMETypeHeader:
Webserver_SendMIMETypeHeader();
HTTPServerApp_SendMIMETypeHeader();
break;
case WEBSERVER_STATE_SendData:
Webserver_SendData();
HTTPServerApp_SendData();
break;
case WEBSERVER_STATE_Closing:
uip_close();
@ -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
* 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;
char* const AppData = (char*)uip_appdata;
@ -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
* 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;
char* const AppData = (char*)uip_appdata;
@ -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
* 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;
char* const AppData = (char*)uip_appdata;
@ -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
* to the receiving HTTP client.
*/
static void Webserver_SendData(void)
static void HTTPServerApp_SendData(void)
{
uip_tcp_appstate_t* const AppState = &uip_conn->appstate;
char* const AppData = (char*)uip_appdata;

12
Projects/Webserver/Lib/HTTPServerApp.h
Unescape View File

@ -68,14 +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 Webserver_OpenRequestedFile(void);
static void Webserver_SendResponseHeader(void);
static void Webserver_SendMIMETypeHeader(void);
static void Webserver_SendData(void);
static void HTTPServerApp_OpenRequestedFile(void);
static void HTTPServerApp_SendResponseHeader(void);
static void HTTPServerApp_SendMIMETypeHeader(void);
static void HTTPServerApp_SendData(void);
#endif
#endif

2
Projects/Webserver/Lib/uIPManagement.c
Unescape View File

@ -75,7 +75,7 @@ void uIPManagement_Init(void)
uip_setethaddr(MACAddress);
/* HTTP Webserver Initialization */
WebserverApp_Init();
HTTPServerApp_Init();
}
/** uIP Management function. This function manages the uIP stack when called while an RNDIS device has been

7
Projects/Webserver/Lib/uip/uip_arp.c
Unescape View File

@ -149,7 +149,7 @@ uip_arp_init(void)
void
uip_arp_timer(void)
{
struct arp_entry *tabptr;
struct arp_entry *tabptr = NULL;
++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)
{
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. */
@ -282,7 +282,6 @@ uip_arp_ipin(void)
void
uip_arp_arpin(void)
{
if(uip_len < sizeof(struct arp_hdr)) {
uip_len = 0;
return;
@ -362,7 +361,7 @@ uip_arp_arpin(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

57
Projects/Webserver/Lib/uip/uipopt.h
Unescape View File

@ -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.
*
* \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
*/
#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
@ -667,8 +664,8 @@ typedef uint32_t uip_stats_t;
* 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
@ -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.
*/
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
@ -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.
*/
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__ */

Write Preview
Loading…
Cancel
Save