From 1157c13eb670c330ef7be4cf10b9b3eee1624f92 Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Mon, 26 Jan 2015 10:35:29 +0900
Subject: [PATCH] GCS_MAVLink: mavlink_comm_x become UARTDrivers

---
 libraries/GCS_MAVLink/GCS_MAVLink.cpp | 7 +++----
 libraries/GCS_MAVLink/GCS_MAVLink.h   | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.cpp b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
index 9cbb19cc2f..bd4da649ef 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
@@ -31,11 +31,10 @@ This provides some support code and variables for MAVLink enabled sketches
 #include "include/mavlink/v1.0/mavlink_helpers.h"
 #endif
 
-
-AP_HAL::BetterStream	*mavlink_comm_0_port;
-AP_HAL::BetterStream	*mavlink_comm_1_port;
+AP_HAL::UARTDriver	*mavlink_comm_0_port;
+AP_HAL::UARTDriver	*mavlink_comm_1_port;
 #if MAVLINK_COMM_NUM_BUFFERS > 2
-AP_HAL::BetterStream	*mavlink_comm_2_port;
+AP_HAL::UARTDriver	*mavlink_comm_2_port;
 #endif
 
 mavlink_system_t mavlink_system = {7,1};
diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.h b/libraries/GCS_MAVLink/GCS_MAVLink.h
index 619a1ef9c9..1008334b3b 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.h
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.h
@@ -51,14 +51,14 @@
 #include "include/mavlink/v1.0/mavlink_types.h"
 
 /// MAVLink stream used for uartA
-extern AP_HAL::BetterStream	*mavlink_comm_0_port;
+extern AP_HAL::UARTDriver	*mavlink_comm_0_port;
 
 /// MAVLink stream used for uartC
-extern AP_HAL::BetterStream	*mavlink_comm_1_port;
+extern AP_HAL::UARTDriver	*mavlink_comm_1_port;
 
 #if MAVLINK_COMM_NUM_BUFFERS > 2
 /// MAVLink stream used for uartD
-extern AP_HAL::BetterStream	*mavlink_comm_2_port;
+extern AP_HAL::UARTDriver	*mavlink_comm_2_port;
 #endif
 
 /// MAVLink system definition