projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
71eaf2b
..
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"
@@
-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;
}