ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
This commit is contained in:
Dean Camera 2010-02-03 00:48:06 +00:00
parent a96d77eca7
commit 08e8d6393e
6 changed files with 48 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Projects/Webserver/Lib/uip/uip_arp.c
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
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__ */