From f1b14932149153a096961fff94191778f88581d9 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 4 Jun 2012 20:49:15 -0700 Subject: [PATCH] altos: Remove unused AES code from teledongle and tidongle Leave this out as neither of these products need it. Signed-off-by: Keith Packard --- src/cc1111/ao_pins.h | 10 +++++----- src/product/Makefile.telebt | 4 ++-- src/product/Makefile.teledongle | 4 ++-- src/product/ao_teledongle.c | 2 -- src/product/ao_tidongle.c | 2 -- src/tidongle/Makefile | 2 -- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h index 5eef0de4..0923e75d 100644 --- a/src/cc1111/ao_pins.h +++ b/src/cc1111/ao_pins.h @@ -150,7 +150,7 @@ #define HAS_MONITOR 1 #define LEGACY_MONITOR 1 #define HAS_RSSI 1 - #define HAS_AES 1 + #define HAS_AES 0 #endif #if defined(TELEMINI_V_1_0) @@ -259,7 +259,7 @@ #define HAS_MONITOR 1 #define LEGACY_MONITOR 1 #define HAS_RSSI 1 - #define HAS_AES 1 + #define HAS_AES 0 #endif #if defined(TIDONGLE) @@ -286,7 +286,7 @@ #define HAS_MONITOR 1 #define LEGACY_MONITOR 1 #define HAS_RSSI 1 - #define HAS_AES 1 + #define HAS_AES 0 #endif #if defined(TELEBT_V_0_0) @@ -322,7 +322,7 @@ #define HAS_MONITOR 1 #define LEGACY_MONITOR 1 #define HAS_RSSI 0 - #define HAS_AES 1 + #define HAS_AES 0 #endif #if defined(TELEBT_V_0_1) @@ -365,7 +365,7 @@ #define HAS_MONITOR 1 #define LEGACY_MONITOR 1 #define HAS_RSSI 0 - #define HAS_AES 1 + #define HAS_AES 0 #endif #if defined(TELELAUNCH_V_0_1) diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt index e53aa2c4..90525d63 100644 --- a/src/product/Makefile.telebt +++ b/src/product/Makefile.telebt @@ -15,6 +15,8 @@ endif INC = \ ao.h \ ao_pins.h \ + ao_arch.h \ + ao_arch_funcs.h \ cc1111.h \ ao_product.h \ $(TELEBT_INC) @@ -32,14 +34,12 @@ CORE_SRC = \ ao_freq.c CC1111_SRC = \ - ao_aes.c \ ao_dbg.c \ ao_dma.c \ ao_led.c \ ao_packet.c \ ao_packet_master.c \ ao_radio.c \ - ao_radio_cmac.c \ ao_romconfig.c \ ao_serial.c \ ao_string.c \ diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle index 27e7d24b..fbf14a04 100644 --- a/src/product/Makefile.teledongle +++ b/src/product/Makefile.teledongle @@ -18,6 +18,8 @@ endif INC = \ ao.h \ ao_pins.h \ + ao_arch.h \ + ao_arch_funcs.h \ cc1111.h \ ao_product.h @@ -35,14 +37,12 @@ CORE_SRC = \ ao_freq.c CC1111_SRC = \ - ao_aes.c \ ao_dbg.c \ ao_dma.c \ ao_led.c \ ao_packet.c \ ao_packet_master.c \ ao_radio.c \ - ao_radio_cmac.c \ ao_romconfig.c \ ao_string.c \ ao_timer.c \ diff --git a/src/product/ao_teledongle.c b/src/product/ao_teledongle.c index 49b80500..0c829e97 100644 --- a/src/product/ao_teledongle.c +++ b/src/product/ao_teledongle.c @@ -35,8 +35,6 @@ main(void) #if HAS_DBG ao_dbg_init(); #endif - ao_aes_init(); - ao_radio_cmac_init(); ao_config_init(); ao_start_scheduler(); } diff --git a/src/product/ao_tidongle.c b/src/product/ao_tidongle.c index a504a747..cba0b122 100644 --- a/src/product/ao_tidongle.c +++ b/src/product/ao_tidongle.c @@ -34,8 +34,6 @@ main(void) ao_rssi_init(AO_LED_RED); ao_radio_init(); ao_dbg_init(); - ao_aes_init(); - ao_radio_cmac_init(); ao_config_init(); /* Bring up the USB link */ P1DIR |= 1; diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile index 149b00c5..0bb2ce32 100644 --- a/src/tidongle/Makefile +++ b/src/tidongle/Makefile @@ -30,14 +30,12 @@ CORE_SRC = \ ao_freq.c CC1111_SRC = \ - ao_aes.c \ ao_dbg.c \ ao_dma.c \ ao_led.c \ ao_packet.c \ ao_packet_master.c \ ao_radio.c \ - ao_radio_cmac.c \ ao_romconfig.c \ ao_string.c \ ao_timer.c \ -- 2.30.2