From fc6cd7102b0948295db868baeecc457761074c69 Mon Sep 17 00:00:00 2001
From: neilt6 <neilt66@icloud.com>
Date: Tue, 6 Sep 2016 11:02:04 -0600
Subject: [PATCH] Updated USBDevice to use Callback

Updated USBAudio and USBSerial to use Callback<void()> instead of
FunctionPointer to fix compiler warnings.
---
 libraries/USBDevice/USBAudio/USBAudio.h   | 4 ++--
 libraries/USBDevice/USBSerial/USBSerial.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/USBDevice/USBAudio/USBAudio.h b/libraries/USBDevice/USBAudio/USBAudio.h
index 5038f053c8e..f016ff0a0ec 100644
--- a/libraries/USBDevice/USBAudio/USBAudio.h
+++ b/libraries/USBDevice/USBAudio/USBAudio.h
@@ -25,7 +25,7 @@
 #include "USBDevice_Types.h"
 
 #include "USBDevice.h"
-
+#include "Callback.h"
 
 /**
 * USBAudio example
@@ -275,7 +275,7 @@ class USBAudio: public USBDevice {
     volatile uint8_t * buf_stream_out;
 
     // callback to update volume
-    FunctionPointer updateVol;
+    Callback<void()> updateVol;
 
     // boolean showing that the SOF handler has been called. Useful for readNB.
     volatile bool SOF_handler;
diff --git a/libraries/USBDevice/USBSerial/USBSerial.h b/libraries/USBDevice/USBSerial/USBSerial.h
index 164cf9bc7da..286b5a384d8 100644
--- a/libraries/USBDevice/USBSerial/USBSerial.h
+++ b/libraries/USBDevice/USBSerial/USBSerial.h
@@ -22,7 +22,7 @@
 #include "USBCDC.h"
 #include "Stream.h"
 #include "CircBuffer.h"
-
+#include "Callback.h"
 
 /**
 * USBSerial example
@@ -153,7 +153,7 @@ class USBSerial: public USBCDC, public Stream {
     }
 
 private:
-    FunctionPointer rx;
+    Callback<void()> rx;
     CircBuffer<uint8_t,128> buf;
     void (*settingsChangedCallback)(int baud, int bits, int parity, int stop);
 };