From f979fd36be0a1d0047a46276226da7ff83fa13fe Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Tue, 2 Feb 2010 12:56:29 +0000
Subject: [PATCH] Remove now unused conf directory from the uIP stack in the
 Webserver project.

---
 Projects/Webserver/Lib/uip/conf/apps-conf.h   |  37 -----
 Projects/Webserver/Lib/uip/conf/clock-arch.c  |  38 ------
 Projects/Webserver/Lib/uip/conf/clock-arch.h  |  12 --
 Projects/Webserver/Lib/uip/conf/global-conf.h |   8 --
 Projects/Webserver/Lib/uip/conf/uip-conf.h    | 128 ------------------
 5 files changed, 223 deletions(-)
 delete mode 100644 Projects/Webserver/Lib/uip/conf/apps-conf.h
 delete mode 100644 Projects/Webserver/Lib/uip/conf/clock-arch.c
 delete mode 100644 Projects/Webserver/Lib/uip/conf/clock-arch.h
 delete mode 100644 Projects/Webserver/Lib/uip/conf/global-conf.h
 delete mode 100644 Projects/Webserver/Lib/uip/conf/uip-conf.h

diff --git a/Projects/Webserver/Lib/uip/conf/apps-conf.h b/Projects/Webserver/Lib/uip/conf/apps-conf.h
deleted file mode 100644
index 0060f1f4c..000000000
--- a/Projects/Webserver/Lib/uip/conf/apps-conf.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef __APPS_CONF_H__
-#define __APPS_CONF_H__
-
-	#include <ff.h>
-
-	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;
-		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;
-
-	#define UIP_APPCALL     WebserverApp_Callback
-	#define UIP_UDP_APPCALL DHCPApp_Callback
-	void UIP_APPCALL(void);
-	void UIP_UDP_APPCALL(void);
-
-#endif /*__APPS_CONF_H__*/
diff --git a/Projects/Webserver/Lib/uip/conf/clock-arch.c b/Projects/Webserver/Lib/uip/conf/clock-arch.c
deleted file mode 100644
index 2007de4e9..000000000
--- a/Projects/Webserver/Lib/uip/conf/clock-arch.c
+++ /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)
-{
-	clock_datetime += 1;
-}
-
-//Initialise the clock
-void clock_init()
-{
-	OCR1A  = ((F_CPU / 1024) / 100);
-	TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
-	TIMSK1 = (1 << OCIE1A);
-}
-
-//Return time
-clock_time_t clock_time()
-{
-	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
index 9c895e56d..000000000
--- a/Projects/Webserver/Lib/uip/conf/clock-arch.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __CLOCK_ARCH_H__
-#define __CLOCK_ARCH_H__
-
-#include "global-conf.h"
-#include <stdint.h>
-
-typedef uint16_t clock_time_t;
-#define CLOCK_CONF_SECOND 100
-void clock_init(void);
-clock_time_t clock_time(void);
-
-#endif /* __CLOCK_ARCH_H__ */
diff --git a/Projects/Webserver/Lib/uip/conf/global-conf.h b/Projects/Webserver/Lib/uip/conf/global-conf.h
deleted file mode 100644
index 5cfc60746..000000000
--- a/Projects/Webserver/Lib/uip/conf/global-conf.h
+++ /dev/null
@@ -1,8 +0,0 @@
-//Project specific configurations
-#ifndef __GLOBAL_CONF_H__
-#define __GLOBAL_CONF_H__
-
-//Include uip.h gives all the uip configurations in uip-conf.h
-#include "uip.h"
-
-#endif /*__GLOBAL_CONF_H__*/
diff --git a/Projects/Webserver/Lib/uip/conf/uip-conf.h b/Projects/Webserver/Lib/uip/conf/uip-conf.h
deleted file mode 100644
index b13d0e19f..000000000
--- a/Projects/Webserver/Lib/uip/conf/uip-conf.h
+++ /dev/null
@@ -1,128 +0,0 @@
-#ifndef __UIP_CONF_H__
-#define __UIP_CONF_H__
-
-#include <inttypes.h>
-#include <avr/io.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#define UIP_CONF_LLH_LEN 14
-
-/**
- * 8 bit datatype
- *
- * This typedef defines the 8-bit type used throughout uIP.
- *
- * \hideinitializer
- */
-typedef uint8_t u8_t;
-
-/**
- * 16 bit datatype
- *
- * This typedef defines the 16-bit type used throughout uIP.
- *
- * \hideinitializer
- */
-typedef uint16_t u16_t;
-
-/**
- * Statistics datatype
- *
- * This typedef defines the dataype used for keeping statistics in
- * uIP.
- *
- * \hideinitializer
- */
-typedef unsigned short uip_stats_t;
-
-#define UIP_CONF_IPV6 0
-#define UIP_ARCH_ADD32 0
-#define UIP_ARCH_CHKSUM 0
-
-/**
- * Maximum number of TCP connections.
- *
- * \hideinitializer
- */
-#define UIP_CONF_MAX_CONNECTIONS 5
-
-/**
- * Maximum number of listening TCP ports.
- *
- * \hideinitializer
- */
-#define UIP_CONF_MAX_LISTENPORTS 1
-
-/**
- * uIP buffer size.
- *
- * \hideinitializer
- */
-#define UIP_CONF_BUFFER_SIZE     1500
-/**
- * CPU byte order.
- *
- * \hideinitializer
- */
-#define UIP_CONF_BYTE_ORDER      UIP_LITTLE_ENDIAN
-
-/**
- * Logging on or off
- *
- * \hideinitializer
- */
-#define UIP_CONF_LOGGING         0
-
-/**
- * UDP support on or off
- *
- * \hideinitializer
- */
-#if defined(ENABLE_DHCP)
-	#define UIP_CONF_UDP         1
-#else
-	#define UIP_CONF_UDP         0
-#endif
-
-/**
- * UDP checksums on or off
- *
- * \hideinitializer
- */
-#define UIP_CONF_UDP_CHECKSUMS   0
-
-/**
- * uIP statistics on or off
- *
- * \hideinitializer
- */
-#define UIP_CONF_STATISTICS      0
-
-/**
- * Broadcast support.
- *
- * \hideinitializer
- */
-#define UIP_CONF_BROADCAST		0
-
-/**
- * The maximum amount of concurrent UDP connections.
- *
- * \hideinitializer
- */
-#define UIP_CONF_UDP_CONNS		1
-
-/**
- *  Host identifier define (e.g. MAC address). If defined as 0,
- *  this will use the internal MAC ethernet address define.
- */
-#define UIP_NEIGHBOR_CONF_ADDRTYPE 0
-
-//Include app configuration
-#include "apps-conf.h"
-
-#endif /* __UIP_CONF_H__ */
-
-/** @} */
-/** @} */
-- 
GitLab