Update Studio Integration DLL, to include package logging.

[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 e8a676b..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,27 +10,28 @@
 volatile clock_time_t clock_datetime = 0;
 
 //Overflow interrupt
 volatile clock_time_t clock_datetime = 0;
 
 //Overflow interrupt

-ISR(TIMER1_COMPA_vect)
-{\r
+ISR(TIMER1_COMPA_vect, ISR_BLOCK)
+{

        clock_datetime += 1;
 }
 
 //Initialise the clock
        clock_datetime += 1;
 }
 
 //Initialise the clock

-void clock_init()\r
-{\r
-       OCR1A  = ((F_CPU / 1024) / 100);
+void clock_init()
+{
+       OCR1A  = (((F_CPU / 1024) / 100) - 1);

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

-clock_time_t clock_time()\r
-{\r
+clock_time_t clock_time()
+{

        clock_time_t time;
 
        clock_time_t time;
 

-       cli();
-               time = clock_datetime;
-       sei();
+       GlobalInterruptDisable();
+       time = clock_datetime;
+       GlobalInterruptEnable();

 
        return time;
 }
 
        return time;
 }

+