Remove now unused conf directory from the uIP stack in the Webserver project.
authorDean Camera <dean@fourwalledcubicle.com>
Tue, 2 Feb 2010 12:56:29 +0000 (12:56 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Tue, 2 Feb 2010 12:56:29 +0000 (12:56 +0000)
Projects/Webserver/Lib/uip/conf/apps-conf.h [deleted file]
Projects/Webserver/Lib/uip/conf/clock-arch.c [deleted file]
Projects/Webserver/Lib/uip/conf/clock-arch.h [deleted file]
Projects/Webserver/Lib/uip/conf/global-conf.h [deleted file]
Projects/Webserver/Lib/uip/conf/uip-conf.h [deleted file]

diff --git a/Projects/Webserver/Lib/uip/conf/apps-conf.h b/Projects/Webserver/Lib/uip/conf/apps-conf.h
deleted file mode 100644 (file)
index 0060f1f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __APPS_CONF_H__\r
-#define __APPS_CONF_H__\r
-\r
-       #include <ff.h>\r
-\r
-       typedef struct\r
-       {\r
-               uint8_t  CurrentState;\r
-               uint8_t  NextState;\r
-               \r
-               char     FileName[30];\r
-               FIL      FileHandle;\r
-               bool     FileOpen;\r
-               uint32_t ACKedFilePos;\r
-               uint16_t SentChunkSize;\r
-       } uip_tcp_appstate_t;\r
-\r
-       typedef struct\r
-       {\r
-               uint8_t CurrentState;\r
-               struct  uip_udp_conn* Connection;\r
-               \r
-               struct\r
-               {\r
-                       uint8_t AllocatedIP[4];\r
-                       uint8_t Netmask[4];\r
-                       uint8_t GatewayIP[4];\r
-                       uint8_t ServerIP[4];\r
-               } DHCPOffer_Data;\r
-       } uip_udp_appstate_t;\r
-\r
-       #define UIP_APPCALL     WebserverApp_Callback\r
-       #define UIP_UDP_APPCALL DHCPApp_Callback\r
-       void UIP_APPCALL(void);\r
-       void UIP_UDP_APPCALL(void);\r
-\r
-#endif /*__APPS_CONF_H__*/\r
diff --git a/Projects/Webserver/Lib/uip/conf/clock-arch.c b/Projects/Webserver/Lib/uip/conf/clock-arch.c
deleted file mode 100644 (file)
index 2007de4..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#include "global-conf.h"
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <avr/sfr_defs.h>
-
-#include "clock-arch.h"
-
-//Counted time
-volatile clock_time_t clock_datetime = 0;
-
-//Overflow interrupt
-ISR(TIMER1_COMPA_vect)
-{\r
-       clock_datetime += 1;
-}
-
-//Initialise the clock
-void clock_init()\r
-{\r
-       OCR1A  = ((F_CPU / 1024) / 100);
-       TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
-       TIMSK1 = (1 << OCIE1A);
-}
-
-//Return time
-clock_time_t clock_time()\r
-{\r
-       clock_time_t time;
-
-       cli();
-               time = clock_datetime;
-       sei();
-
-       return time;
-}
diff --git a/Projects/Webserver/Lib/uip/conf/clock-arch.h b/Projects/Webserver/Lib/uip/conf/clock-arch.h
deleted file mode 100644 (file)
index 9c895e5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __CLOCK_ARCH_H__\r
-#define __CLOCK_ARCH_H__\r
-\r
-#include "global-conf.h"\r
-#include <stdint.h>\r
-\r
-typedef uint16_t clock_time_t;\r
-#define CLOCK_CONF_SECOND 100\r
-void clock_init(void);\r
-clock_time_t clock_time(void);\r
-\r
-#endif /* __CLOCK_ARCH_H__ */\r
diff --git a/Projects/Webserver/Lib/uip/conf/global-conf.h b/Projects/Webserver/Lib/uip/conf/global-conf.h
deleted file mode 100644 (file)
index 5cfc607..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-//Project specific configurations\r
-#ifndef __GLOBAL_CONF_H__\r
-#define __GLOBAL_CONF_H__\r
-\r
-//Include uip.h gives all the uip configurations in uip-conf.h\r
-#include "uip.h"\r
-\r
-#endif /*__GLOBAL_CONF_H__*/\r
diff --git a/Projects/Webserver/Lib/uip/conf/uip-conf.h b/Projects/Webserver/Lib/uip/conf/uip-conf.h
deleted file mode 100644 (file)
index b13d0e1..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef __UIP_CONF_H__\r
-#define __UIP_CONF_H__\r
-\r
-#include <inttypes.h>\r
-#include <avr/io.h>\r
-#include <stdio.h>\r
-#include <stdbool.h>\r
-\r
-#define UIP_CONF_LLH_LEN 14\r
-\r
-/**\r
- * 8 bit datatype\r
- *\r
- * This typedef defines the 8-bit type used throughout uIP.\r
- *\r
- * \hideinitializer\r
- */\r
-typedef uint8_t u8_t;\r
-\r
-/**\r
- * 16 bit datatype\r
- *\r
- * This typedef defines the 16-bit type used throughout uIP.\r
- *\r
- * \hideinitializer\r
- */\r
-typedef uint16_t u16_t;\r
-\r
-/**\r
- * Statistics datatype\r
- *\r
- * This typedef defines the dataype used for keeping statistics in\r
- * uIP.\r
- *\r
- * \hideinitializer\r
- */\r
-typedef unsigned short uip_stats_t;\r
-\r
-#define UIP_CONF_IPV6 0\r
-#define UIP_ARCH_ADD32 0\r
-#define UIP_ARCH_CHKSUM 0\r
-\r
-/**\r
- * Maximum number of TCP connections.\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_MAX_CONNECTIONS 5\r
-\r
-/**\r
- * Maximum number of listening TCP ports.\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_MAX_LISTENPORTS 1\r
-\r
-/**\r
- * uIP buffer size.\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_BUFFER_SIZE     1500\r
-/**\r
- * CPU byte order.\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_BYTE_ORDER      UIP_LITTLE_ENDIAN\r
-\r
-/**\r
- * Logging on or off\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_LOGGING         0\r
-\r
-/**\r
- * UDP support on or off\r
- *\r
- * \hideinitializer\r
- */\r
-#if defined(ENABLE_DHCP)\r
-       #define UIP_CONF_UDP         1\r
-#else\r
-       #define UIP_CONF_UDP         0\r
-#endif\r
-\r
-/**\r
- * UDP checksums on or off\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_UDP_CHECKSUMS   0\r
-\r
-/**\r
- * uIP statistics on or off\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_STATISTICS      0\r
-\r
-/**\r
- * Broadcast support.\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_BROADCAST             0\r
-\r
-/**\r
- * The maximum amount of concurrent UDP connections.\r
- *\r
- * \hideinitializer\r
- */\r
-#define UIP_CONF_UDP_CONNS             1\r
-\r
-/**\r
- *  Host identifier define (e.g. MAC address). If defined as 0,\r
- *  this will use the internal MAC ethernet address define.\r
- */\r
-#define UIP_NEIGHBOR_CONF_ADDRTYPE 0\r
-\r
-//Include app configuration\r
-#include "apps-conf.h"\r
-\r
-#endif /* __UIP_CONF_H__ */\r
-\r
-/** @} */\r
-/** @} */\r