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 8632296..e71f720 100644 (file)
--- a/Projects/Webserver/Lib/uip/clock.c
+++ b/Projects/Webserver/Lib/uip/clock.c
@@ -1,9 +1,8 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>

-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include <avr/sfr_defs.h>
+
+#include <LUFA/Common/Common.h>

 
 #include "clock.h"
 
 
 #include "clock.h"
 


@@ -11,7 +10,7 @@
 volatile clock_time_t clock_datetime = 0;
 
 //Overflow interrupt
 volatile clock_time_t clock_datetime = 0;
 
 //Overflow interrupt

-ISR(TIMER1_COMPA_vect)
+ISR(TIMER1_COMPA_vect, ISR_BLOCK)

 {
        clock_datetime += 1;
 }
 {
        clock_datetime += 1;
 }


@@ -19,7 +18,7 @@ ISR(TIMER1_COMPA_vect)
 //Initialise the clock
 void clock_init()
 {
 //Initialise the clock
 void clock_init()
 {

-       OCR1A  = ((F_CPU / 1024) / 100);
+       OCR1A  = (((F_CPU / 1024) / 100) - 1);

        TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
        TIMSK1 = (1 << OCIE1A);
 }
        TCCR1B = ((1 << WGM12) | (1 << CS12) | (1 << CS10));
        TIMSK1 = (1 << OCIE1A);
 }


@@ -29,10 +28,9 @@ clock_time_t clock_time()
 {
        clock_time_t time;
 
 {
        clock_time_t time;
 

-       ATOMIC_BLOCK(ATOMIC_FORCEON)
-       {
-               time = clock_datetime;
-       }
+       GlobalInterruptDisable();
+       time = clock_datetime;
+       GlobalInterruptEnable();

 
        return time;
 }
 
        return time;
 }