From: Keith Packard <keithp@keithp.com>
Date: Thu, 3 Sep 2009 05:01:52 +0000 (-0700)
Subject: Remove bit-banging debug support from TM board builds
X-Git-Tag: debian/0.5+77+gc57bd7f~34^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=e2e449d5c23356e913f312de1fb2611a9dd5a352;ds=sidebyside

Remove bit-banging debug support from TM board builds

Our current TM boards don't have the wires to do bit-banging to
another cc1111 board, so it doesn't make sense to fill up their flash
with useless code (and the 'help' text with useless commands). Leave
this to the TI board until we have boards that can serve as debug dongles.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/Makefile b/src/Makefile
index 96049c65..828c48bd 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -24,7 +24,6 @@ INC = \
 #
 ALTOS_SRC = \
 	ao_cmd.c \
-	ao_dbg.c \
 	ao_dma.c \
 	ao_mutex.c \
 	ao_panic.c \
@@ -70,6 +69,12 @@ TELE_FAKE_SRC = \
 	ao_adc_fake.c \
 	ao_ee_fake.c
 
+#
+# Debug dongle driver (only on TI)
+#
+DBG_DONGLE_SRC = \
+	ao_dbg.c
+
 #
 # Drivers only on TeleMetrum
 #
@@ -115,7 +120,8 @@ TI_SRC = \
 	$(TELE_RECEIVER_SRC) \
 	$(TELE_COMMON_SRC) \
 	$(TELE_FAKE_SRC) \
-	$(TI_MAIN_SRC)
+	$(TI_MAIN_SRC) \
+	$(DBG_DONGLE_SRC)
 
 TT_MAIN_SRC = \
 	ao_teleterra.c
diff --git a/src/ao_log.c b/src/ao_log.c
index 19bfdfb8..7945ace4 100644
--- a/src/ao_log.c
+++ b/src/ao_log.c
@@ -109,6 +109,9 @@ ao_log_dump_next(void)
 __xdata uint8_t	ao_log_adc_pos;
 __xdata enum flight_state ao_log_state;
 
+/* a hack to make sure that ao_log_records fill the eeprom block in even units */
+typedef uint8_t check_log_size[1-(256 % sizeof(struct ao_log_record))] ;
+
 void
 ao_log(void)
 {
diff --git a/src/ao_teledongle.c b/src/ao_teledongle.c
index 4ebc53a5..d7b4b75a 100644
--- a/src/ao_teledongle.c
+++ b/src/ao_teledongle.c
@@ -33,7 +33,6 @@ main(void)
 	ao_monitor_init(AO_LED_GREEN, TRUE);
 	ao_rssi_init(AO_LED_RED);
 	ao_radio_init();
-	ao_dbg_init();
 	ao_config_init();
 	ao_start_scheduler();
 }
diff --git a/src/ao_telemetrum.c b/src/ao_telemetrum.c
index 5e951b49..1dbacf89 100644
--- a/src/ao_telemetrum.c
+++ b/src/ao_telemetrum.c
@@ -41,7 +41,6 @@ main(void)
 	ao_telemetry_init();
 	ao_radio_init();
 	ao_igniter_init();
-	ao_dbg_init();
 	ao_config_init();
 	ao_start_scheduler();
 }
diff --git a/src/ao_teleterra.c b/src/ao_teleterra.c
index 6464ccc0..deb63597 100644
--- a/src/ao_teleterra.c
+++ b/src/ao_teleterra.c
@@ -34,7 +34,6 @@ main(void)
 	ao_gps_init();
 	ao_monitor_init(AO_LED_GREEN, TRUE);
 	ao_radio_init();
-	ao_dbg_init();
 	ao_config_init();
 	ao_start_scheduler();
 }