From 5f26c951d82b4398c230a966a7591ee6f7423c18 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 23 Dec 2015 14:34:55 -0200
Subject: [PATCH] GCS_MAVLink: stop using Progmem.h

---
 libraries/GCS_MAVLink/GCS_MAVLink.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/libraries/GCS_MAVLink/GCS_MAVLink.cpp b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
index ce35f37413..ffd99e94a5 100644
--- a/libraries/GCS_MAVLink/GCS_MAVLink.cpp
+++ b/libraries/GCS_MAVLink/GCS_MAVLink.cpp
@@ -20,15 +20,14 @@
 This provides some support code and variables for MAVLink enabled sketches
 
 */
-
-#include <AP_HAL/AP_HAL.h>
-#include <AP_Common/AP_Common.h>
-#include <AP_GPS/AP_GPS.h>
-#include <AP_Progmem/AP_Progmem.h>
-
 #include "GCS.h"
 #include "GCS_MAVLink.h"
 
+#include <AP_Common/AP_Common.h>
+#include <AP_GPS/AP_GPS.h>
+#include <AP_HAL/AP_HAL.h>
+
+
 #ifdef MAVLINK_SEPARATE_HELPERS
 #include "include/mavlink/v1.0/mavlink_helpers.h"
 #endif
@@ -146,12 +145,12 @@ void comm_send_buffer(mavlink_channel_t chan, const uint8_t *buf, uint8_t len)
     mavlink_comm_port[chan]->write(buf, len);
 }
 
-static const uint8_t mavlink_message_crc_progmem[256] = MAVLINK_MESSAGE_CRCS;
+static const uint8_t mavlink_message_crc_table[256] = MAVLINK_MESSAGE_CRCS;
 
 // return CRC byte for a mavlink message ID
 uint8_t mavlink_get_message_crc(uint8_t msgid)
 {
-	return pgm_read_byte(&mavlink_message_crc_progmem[msgid]);
+	return mavlink_message_crc_table[msgid];
 }
 
 extern const AP_HAL::HAL& hal;