From cf4575b94a3c65e6535a159fc71fc885aebc2620 Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Fri, 2 Aug 2019 14:02:40 -0700 Subject: Fix the LUFA lib to use a submodule instead of just files (#6245) * Remove LUFA files * Update descriptions for newer version of LUFA * Create PR6245.md * Fix CDC(Serial) type errors * Fix missed merge conflict for AUDIO_DTYPE_CSInterface --- lib/lufa/Projects/Webserver/Lib/uip/clock.c | 37 ----------------------------- 1 file changed, 37 deletions(-) delete mode 100644 lib/lufa/Projects/Webserver/Lib/uip/clock.c (limited to 'lib/lufa/Projects/Webserver/Lib/uip/clock.c') 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 -#include -#include - -#include - -#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; -} - -- cgit v1.2.3