From 03ee87b35abdb8b92e8b55ec040fa943f9a6786c Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 21 Jan 2010 13:45:44 +0000 Subject: Fix up the incomplete Webserver project so that it integrates with the uIP stack correctly. Add simple HTTP webserver as a placeholder until FatFS can be integrated. Begin to look into the RNDIS Host Class Driver, which seems to crash on test hardware after many packets have been received. --- .../Incomplete/Webserver/Lib/uip/conf/apps-conf.h | 25 +++++++++++++--------- .../Incomplete/Webserver/Lib/uip/conf/uip-conf.h | 11 +--------- 2 files changed, 16 insertions(+), 20 deletions(-) (limited to 'Projects/Incomplete/Webserver/Lib/uip') diff --git a/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h b/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h index 60a7c9eb0..00919f221 100644 --- a/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h +++ b/Projects/Incomplete/Webserver/Lib/uip/conf/apps-conf.h @@ -1,15 +1,20 @@ #ifndef __APPS_CONF_H__ #define __APPS_CONF_H__ -//Here we include the header file for the application(s) we use in our project. - -//#include "smtp.h" -//#include "hello-world.h" -//#include "simple-httpd.h" -//#include "telnetd.h" -//#include "webserver.h" -//#include "dhcpc.h" -//#include "resolv.h" -//#include "webclient.h" + enum Webserver_States_t + { + WEBSERVER_STATE_SendHeaders, + WEBSERVER_STATE_SendData, + WEBSERVER_STATE_Closed, + }; + + typedef struct + { + uint8_t CurrentState; + char* SendPos; + } uip_tcp_appstate_t; + + #define UIP_APPCALL WebserverAppCallback + void UIP_APPCALL(void); #endif /*__APPS_CONF_H__*/ diff --git a/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h b/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h index d46fa265c..d3d9bc453 100644 --- a/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h +++ b/Projects/Incomplete/Webserver/Lib/uip/conf/uip-conf.h @@ -6,15 +6,6 @@ #include #include -typedef int uip_tcp_appstate_t; -typedef int uip_udp_appstate_t; - -#define UIP_APPCALL TCPCallback -#define UIP_UDP_APPCALL TCPCallback - -void UIP_APPCALL(void); -void UIP_UDP_APPCALL(void); - #define UIP_CONF_LLH_LEN 14 /** @@ -68,7 +59,7 @@ typedef unsigned short uip_stats_t; * * \hideinitializer */ -#define UIP_CONF_BUFFER_SIZE 1100 +#define UIP_CONF_BUFFER_SIZE 1500 /** * CPU byte order. * -- cgit v1.2.3