Merge branch 'branch-1.9' into debian

1 files changed, 0 insertions, 54 deletions

diff --git a/src/teleshield-v0.1/ao_teleshield.c b/src/teleshield-v0.1/ao_teleshield.c
deleted file mode 100644
index 713c49f9..00000000
--- a/src/teleshield-v0.1/ao_teleshield.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include "ao.h"
-
-#if 0
-__code uint8_t ao_log_format = AO_LOG_FORMAT_NONE;	/* until we actually log stuff */
-#endif
-
-void
-main(void)
-{
-	ao_clock_init();
-
-	/* Turn on the LED until the system is stable */
-	ao_led_init(LEDS_AVAILABLE);
-	ao_led_on(AO_LED_RED);
-	ao_task_init();
-	ao_timer_init();
-	ao_cmd_init();
-	ao_spi_init();
-	ao_storage_init();
-	ao_usb_init();
-	ao_monitor_init();
-	ao_radio_init();
-	ao_packet_slave_init(1);
-	ao_btm_init();
-#if HAS_DBG
-	ao_dbg_init();
-#endif
-#if HAS_AES
-	ao_aes_init();
-	ao_radio_cmac_init();
-#endif
-	ao_serial_init();
-	ao_ardu_serial_init();
-	ao_config_init();
-	ao_start_scheduler();
-}