diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-03 00:48:06 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-02-03 00:48:06 +0000 |
commit | 08e8d6393edeaf775b5c3fc3bf2a76e62698d129 (patch) | |
tree | fdb18aeb0a59021f2e77cddaf597b731dcbdd63d /Projects/Webserver/Lib/uip/uipopt.h | |
parent | a96d77eca77c84777de7ff289a5144fb0db94517 (diff) | |
download | lufa-08e8d6393edeaf775b5c3fc3bf2a76e62698d129.tar.gz lufa-08e8d6393edeaf775b5c3fc3bf2a76e62698d129.tar.bz2 lufa-08e8d6393edeaf775b5c3fc3bf2a76e62698d129.zip |
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_".
Diffstat (limited to 'Projects/Webserver/Lib/uip/uipopt.h')
-rw-r--r-- | Projects/Webserver/Lib/uip/uipopt.h | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h index a8224d456..23bce28a3 100644 --- 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. - * - * \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__ */ |