Merge remote-tracking branch 'upstream/master'

2 files changed, 0 insertions, 37 deletions

diff --git a/lib/lufa b/lib/lufa
new file mode 160000
+Subproject ce10f7642b0459e409839b23cc91498945119b4
diff --git a/lib/lufa/Projects/Webserver/Lib/uip/clock.c b/lib/lufa/Projects/Webserver/Lib/uip/clock.c
deleted file mode 100644
index e71f7209d2..0000000000
--- a/lib/lufa/Projects/Webserver/Lib/uip/clock.c
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <LUFA/Common/Common.h>
-
-#include "clock.h"
-
-//Counted time
-volatile clock_time_t clock_datetime = 0;
-
-//Overflow interrupt
-ISR(TIMER1_COMPA_vect, ISR_BLOCK)
-{
-	clock_datetime += 1;
-}
-
-//Initialise the clock
-void clock_init()
-{
-	OCR1A  = (((F_CPU / 1024) / 100) - 1);
-	TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
-	TIMSK1 = (1 << OCIE1A);
-}
-
-//Return time
-clock_time_t clock_time()
-{
-	clock_time_t time;
-
-	GlobalInterruptDisable();
-	time = clock_datetime;
-	GlobalInterruptEnable();
-
-	return time;
-}
-