From b3abe89989ce6987e48e26dcead5fdd71fe1cd59 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@galois.com>
Date: Tue, 18 Dec 2012 16:09:40 -0800
Subject: [PATCH] AP_HAL_AVR: add Util stubs

---
 libraries/AP_HAL_AVR/AP_HAL_AVR_Namespace.h |  1 +
 libraries/AP_HAL_AVR/AP_HAL_AVR_private.h   |  1 +
 libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp |  4 ++-
 libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp |  4 ++-
 libraries/AP_HAL_AVR/Scheduler.cpp          |  2 +-
 libraries/AP_HAL_AVR/Scheduler_Timer.cpp    |  1 -
 libraries/AP_HAL_AVR/Util.cpp               | 27 +++++++++++++++++++++
 libraries/AP_HAL_AVR/Util.h                 | 17 +++++++++++++
 8 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 libraries/AP_HAL_AVR/Util.cpp
 create mode 100644 libraries/AP_HAL_AVR/Util.h

diff --git a/libraries/AP_HAL_AVR/AP_HAL_AVR_Namespace.h b/libraries/AP_HAL_AVR/AP_HAL_AVR_Namespace.h
index 1fcd96ce32..bf14dc64df 100644
--- a/libraries/AP_HAL_AVR/AP_HAL_AVR_Namespace.h
+++ b/libraries/AP_HAL_AVR/AP_HAL_AVR_Namespace.h
@@ -26,6 +26,7 @@ namespace AP_HAL_AVR {
     class AVRTimer;
     class AVRSemaphore;
     class ISRRegistry;
+    class AVRUtil;
 }
 
 #endif //__AP_HAL_AVR_NAMESPACE_H__
diff --git a/libraries/AP_HAL_AVR/AP_HAL_AVR_private.h b/libraries/AP_HAL_AVR/AP_HAL_AVR_private.h
index 0d23c0e888..7f7dd4e52b 100644
--- a/libraries/AP_HAL_AVR/AP_HAL_AVR_private.h
+++ b/libraries/AP_HAL_AVR/AP_HAL_AVR_private.h
@@ -12,6 +12,7 @@
 #include "RCInput.h"
 #include "RCOutput.h"
 #include "Scheduler.h"
+#include "Util.h"
 #include "utility/ISRRegistry.h"
 
 #endif // __AP_HAL_AVR_PRIVATE_H__
diff --git a/libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp b/libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp
index eb328d658d..ec0b74a176 100644
--- a/libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp
+++ b/libraries/AP_HAL_AVR/HAL_AVR_APM1_Class.cpp
@@ -30,6 +30,7 @@ static AVRGPIO          avrGPIO;
 static APM1RCInput      apm1RCInput;
 static APM1RCOutput     apm1RCOutput;
 static AVRScheduler     avrScheduler;
+static AVRUtil          avrUtil;
 
 static ISRRegistry isrRegistry;
 
@@ -47,7 +48,8 @@ HAL_AVR_APM1::HAL_AVR_APM1() :
         &avrGPIO,
         &apm1RCInput,
         &apm1RCOutput,
-        &avrScheduler )
+        &avrScheduler,
+        &avrUtil )
 {}
 
 void HAL_AVR_APM1::init(int argc, char * const argv[]) const {
diff --git a/libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp b/libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp
index 6de61f6526..e739ae33f4 100644
--- a/libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp
+++ b/libraries/AP_HAL_AVR/HAL_AVR_APM2_Class.cpp
@@ -30,6 +30,7 @@ static AVRGPIO          avrGPIO;
 static APM2RCInput      apm2RCInput;
 static APM2RCOutput     apm2RCOutput;
 static AVRScheduler     avrScheduler;
+static AVRUtil          avrUtil;
 
 static ISRRegistry isrRegistry;
 
@@ -46,7 +47,8 @@ HAL_AVR_APM2::HAL_AVR_APM2() :
         &avrGPIO,
         &apm2RCInput,
         &apm2RCOutput,
-        &avrScheduler )
+        &avrScheduler,
+        &avrUtil )
 {}
 
 void HAL_AVR_APM2::init(int argc, char * const argv[]) const {
diff --git a/libraries/AP_HAL_AVR/Scheduler.cpp b/libraries/AP_HAL_AVR/Scheduler.cpp
index 99beb7f4a6..6381a50463 100644
--- a/libraries/AP_HAL_AVR/Scheduler.cpp
+++ b/libraries/AP_HAL_AVR/Scheduler.cpp
@@ -7,8 +7,8 @@
 #include <avr/wdt.h>
 #include <avr/interrupt.h>
 
-#include "HAL_AVR.h"
 #include "Scheduler.h"
+#include "ISRRegistry.h"
 using namespace AP_HAL_AVR;
 
 extern const AP_HAL::HAL& hal;
diff --git a/libraries/AP_HAL_AVR/Scheduler_Timer.cpp b/libraries/AP_HAL_AVR/Scheduler_Timer.cpp
index 4f3eae6e69..01d186ee5f 100644
--- a/libraries/AP_HAL_AVR/Scheduler_Timer.cpp
+++ b/libraries/AP_HAL_AVR/Scheduler_Timer.cpp
@@ -4,7 +4,6 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 
-#include "HAL_AVR.h"
 #include "Scheduler.h"
 using namespace AP_HAL_AVR;
 
diff --git a/libraries/AP_HAL_AVR/Util.cpp b/libraries/AP_HAL_AVR/Util.cpp
new file mode 100644
index 0000000000..6eb3fe6244
--- /dev/null
+++ b/libraries/AP_HAL_AVR/Util.cpp
@@ -0,0 +1,27 @@
+
+#include "Util.h"
+using namespace AP_HAL_AVR;
+
+int AVRUtil::snprintf(char* str, size_t size, const char *format, ...)
+{
+
+}
+
+int AVRUtil::snprintf_P(char* str, size_t size, const prog_char_t *format, ...)
+{
+
+}
+
+
+int AVRUtil::vsnprintf(char* str, size_t size, const char *format, va_list ap)
+{
+
+}
+
+int AVRUtil::vsnprintf_P(char* str, size_t size, const prog_char_t *format,
+            va_list ap)
+{
+
+}
+
+
diff --git a/libraries/AP_HAL_AVR/Util.h b/libraries/AP_HAL_AVR/Util.h
new file mode 100644
index 0000000000..4fd556de09
--- /dev/null
+++ b/libraries/AP_HAL_AVR/Util.h
@@ -0,0 +1,17 @@
+
+#ifndef __AP_HAL_AVR_UTIL_H__
+#define __AP_HAL_AVR_UTIL_H__
+
+#include <AP_HAL.h>
+#include "AP_HAL_AVR_Namespace.h"
+
+class AP_HAL_AVR::AVRUtil : public AP_HAL::Util {
+public:
+    int snprintf(char* str, size_t size, const char *format, ...);
+    int snprintf_P(char* str, size_t size, const prog_char_t *format, ...);
+    int vsnprintf(char* str, size_t size, const char *format, va_list ap);
+    int vsnprintf_P(char* str, size_t size, const prog_char_t *format,
+            va_list ap);
+};
+
+#endif // __AP_HAL_AVR_UTIL_H__