Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Projects / Webserver / Lib / uip / clock.c

diff --git a/Projects/Webserver/Lib/uip/clock.c b/Projects/Webserver/Lib/uip/clock.c
index 4507148..e71f720 100644 (file)
--- a/Projects/Webserver/Lib/uip/clock.c
+++ b/Projects/Webserver/Lib/uip/clock.c
@@ -1,38 +1,37 @@
-#include <stdint.h>\r
-#include <stdlib.h>\r
-#include <stdio.h>\r
-#include <avr/interrupt.h>\r
-#include <avr/io.h>\r
-#include <avr/sfr_defs.h>\r
-\r
-#include "clock.h"\r
-\r
-//Counted time\r
-volatile clock_time_t clock_datetime = 0;\r
-\r
-//Overflow interrupt\r
-ISR(TIMER1_COMPA_vect)\r
-{\r
-       clock_datetime += 1;\r
-}\r
-\r
-//Initialise the clock\r
-void clock_init()\r
-{\r
-       OCR1A  = ((F_CPU / 1024) / 100);\r
-       TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));\r
-       TIMSK1 = (1 << OCIE1A);\r
-}\r
-\r
-//Return time\r
-clock_time_t clock_time()\r
-{\r
-       clock_time_t time;\r
-\r
-       ATOMIC_BLOCK(ATOMIC_FORCEON)\r
-       {\r
-               time = clock_datetime;\r
-       }\r
-\r
-       return time;\r
-}\r
+#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;
+}
+