Merge nyus.joshuawise.com:/storage/git/netwatch

diff --git a/include/minilib.h b/include/minilib.h
index aa8bf7364d16220e854c019518178fd0479060b0..3704bca217e9a5caa3d554acd484e01f90d9c247 100644 (file)
--- a/include/minilib.h
+++ b/include/minilib.h
@@ -3,7 +3,7 @@
 
 #include <stdarg.h>
 
-extern void memcpy(void *dest, void *src, int bytes);
+extern void memcpy(void *dest, const void *src, int bytes);
 extern void memmove(void *dest, void *src, int bytes);
 extern int memcmp(const char *a2, const char *a1, int bytes);
 extern int strcmp(const char *a2, const char *a1);

diff --git a/include/timer.h b/include/timer.h
new file mode 100644 (file)
index 0000000..56054b0
--- /dev/null
+++ b/include/timer.h
@@ -0,0 +1,7 @@
+#ifndef TIMER_H
+#define TIMER_H
+
+void oneshot_start_ms(unsigned long milliseconds);
+int oneshot_running(void);
+
+#endif TIMER_H

diff --git a/lib/minilib.c b/lib/minilib.c
index 7baca595ed4c62fa3ff0d09d1c8bbcaf1c0815d6..48d79484dd5cda244405a0b30c4e2555c733716a 100644 (file)
--- a/lib/minilib.c
+++ b/lib/minilib.c
@@ -1,7 +1,7 @@
 #include "console.h"
 #include <minilib.h>
 
-void memcpy(void *dest, void *src, int bytes)
+void memcpy(void *dest, const void *src, int bytes)
 {
        char * cdest = dest;
        char * csrc = src;