From 8117ba3553789a2bae9beb92fbe9e14e3cc79389 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 12 Jun 2014 23:56:07 -0700
Subject: [PATCH] altos: Define ao_log_mutex in ao_log.c rather than every log
 product

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/kernel/ao_log.c        | 1 +
 src/kernel/ao_log.h        | 2 +-
 src/kernel/ao_log_big.c    | 1 -
 src/kernel/ao_log_gps.c    | 1 -
 src/kernel/ao_log_mega.c   | 1 -
 src/kernel/ao_log_metrum.c | 1 -
 src/kernel/ao_log_mini.c   | 1 -
 7 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/kernel/ao_log.c b/src/kernel/ao_log.c
index 3cf85a33..d9c3e00f 100644
--- a/src/kernel/ao_log.c
+++ b/src/kernel/ao_log.c
@@ -19,6 +19,7 @@
 #include <ao_log.h>
 #include <ao_config.h>
 
+__xdata uint8_t	ao_log_mutex;
 __pdata uint32_t ao_log_current_pos;
 __pdata uint32_t ao_log_end_pos;
 __pdata uint32_t ao_log_start_pos;
diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index 87fa0d4d..33cda3eb 100644
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -29,7 +29,7 @@
  * by sleeping on this variable.
  */
 extern __xdata uint16_t ao_flight_number;
-
+extern __xdata uint8_t	ao_log_mutex;
 extern __pdata uint32_t ao_log_current_pos;
 extern __pdata uint32_t ao_log_end_pos;
 extern __pdata uint32_t ao_log_start_pos;
diff --git a/src/kernel/ao_log_big.c b/src/kernel/ao_log_big.c
index db01f46c..8f57bf75 100644
--- a/src/kernel/ao_log_big.c
+++ b/src/kernel/ao_log_big.c
@@ -17,7 +17,6 @@
 
 #include "ao.h"
 
-static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_record log;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_FULL;
diff --git a/src/kernel/ao_log_gps.c b/src/kernel/ao_log_gps.c
index 8bf529f4..3b728c25 100644
--- a/src/kernel/ao_log_gps.c
+++ b/src/kernel/ao_log_gps.c
@@ -23,7 +23,6 @@
 #include <ao_distance.h>
 #include <ao_tracker.h>
 
-static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_gps log;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_TELEGPS;
diff --git a/src/kernel/ao_log_mega.c b/src/kernel/ao_log_mega.c
index 8997fd05..cb83be4b 100644
--- a/src/kernel/ao_log_mega.c
+++ b/src/kernel/ao_log_mega.c
@@ -20,7 +20,6 @@
 #include <ao_data.h>
 #include <ao_flight.h>
 
-static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_mega log;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMEGA;
diff --git a/src/kernel/ao_log_metrum.c b/src/kernel/ao_log_metrum.c
index 9b17adc2..08e7b8c4 100644
--- a/src/kernel/ao_log_metrum.c
+++ b/src/kernel/ao_log_metrum.c
@@ -20,7 +20,6 @@
 #include <ao_data.h>
 #include <ao_flight.h>
 
-static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_metrum log;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMETRUM;
diff --git a/src/kernel/ao_log_mini.c b/src/kernel/ao_log_mini.c
index 29e3bd9f..0ca3ed06 100644
--- a/src/kernel/ao_log_mini.c
+++ b/src/kernel/ao_log_mini.c
@@ -20,7 +20,6 @@
 #include <ao_data.h>
 #include <ao_flight.h>
 
-static __xdata uint8_t	ao_log_mutex;
 static __xdata struct ao_log_mini log;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT;
-- 
2.30.2