Fixed SerialStream driver blocking while waiting for characters to be received instea...

[pub/USBasp.git] / Projects / Webserver / Lib / uip / uipopt.h

diff --git a/Projects/Webserver/Lib/uip/uipopt.h b/Projects/Webserver/Lib/uip/uipopt.h
index a8224d4..c8b3ad5 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.
- *
- * \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.
  */
 
 /**
@@ -349,14 +346,18 @@
  *
  * \hideinitializer
  */
+#if !defined(UIP_URGDATA)
 #define UIP_URGDATA      0
+#endif
 
 /**
  * The initial retransmission timeout counted in timer pulses.
  *
  * This should not be changed.
  */
+#if !defined(UIP_RTO)
 #define UIP_RTO         3
+#endif
 
 /**
  * The maximum number of times a segment should be retransmitted
@@ -364,7 +365,9 @@
  *
  * This should not be changed.
  */
+#if !defined(UIP_MAXRTX)
 #define UIP_MAXRTX      8
+#endif
 
 /**
  * The maximum number of times a SYN segment should be retransmitted
@@ -373,7 +376,9 @@
  *
  * This should not need to be changed.
  */
+#if !defined(UIP_MAXSYNRTX)
 #define UIP_MAXSYNRTX      5
+#endif
 
 /**
  * The TCP maximum segment size.
@@ -657,8 +662,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 uIPManagement_UDPCallback
+void UIP_UDP_APPCALL(void);
 
 /**
  * \var #define UIP_APPCALL
@@ -667,8 +672,8 @@ typedef uint32_t uip_stats_t;
  * response to TCP/IP events.
  *
  */
-       #define UIP_APPCALL     WebserverApp_Callback
-       void UIP_APPCALL(void);
+#define UIP_APPCALL     uIPManagement_TCPCallback
+void UIP_APPCALL(void);
 
 /**
  * \var typedef uip_tcp_appstate_t
@@ -677,7 +682,9 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
-       typedef struct
+typedef union
+{
+       struct
        {
                uint8_t  CurrentState;
                uint8_t  NextState;
@@ -687,7 +694,16 @@ typedef uint32_t uip_stats_t;
                bool     FileOpen;
                uint32_t ACKedFilePos;
                uint16_t SentChunkSize;
-       } uip_tcp_appstate_t;
+       } HTTPServer;
+       
+       struct
+       {
+               uint8_t  CurrentState;
+               uint8_t  NextState;
+               
+               uint8_t  IssuedCommand;
+       } TELNETServer;
+} uip_tcp_appstate_t;
 
 /**
  * \var typedef uip_udp_appstate_t
@@ -696,7 +712,9 @@ typedef uint32_t uip_stats_t;
  * uip_conn structure. This usually is typedef:ed to a struct holding
  * application state information.
  */
-       typedef struct
+typedef union
+{
+       struct
        {
                uint8_t CurrentState;
                struct  uip_udp_conn* Connection;
@@ -708,7 +726,8 @@ typedef uint32_t uip_stats_t;
                        uint8_t GatewayIP[4];
                        uint8_t ServerIP[4];
                } DHCPOffer_Data;
-       } uip_udp_appstate_t;
+       } DHCPClient;
+} uip_udp_appstate_t;
 /** @} */
 
 #endif /* __UIPOPT_H__ */