altos: Make sure cc1120 is initialized correctly at startup time

[fw/altos] / src / drivers / ao_cc1120.c

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 37dc67db9f8612eb2776e5e9721910dad2563041..63f7cd890ec4c5a0d34d785c9d1485ee48105f05 100644 (file)
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -725,7 +725,7 @@ static const struct ao_cmds ao_radio_cmds[] = {
        { ao_radio_test,        "C <1 start, 0 stop, none both>\0Radio carrier test" },
 #if CC1120_DEBUG
        { ao_radio_show,        "R\0Show CC1120 status" },
-       { ao_radio_beep,        "B\0Emit an RDF beacon" },
+       { ao_radio_beep,        "b\0Emit an RDF beacon" },
 #endif
        { 0, NULL }
 };
@@ -733,8 +733,18 @@ static const struct ao_cmds ao_radio_cmds[] = {
 void
 ao_radio_init(void)
 {
+       int     i;
+
        ao_radio_configured = 0;
        ao_spi_init_cs (AO_CC1120_SPI_CS_PORT, (1 << AO_CC1120_SPI_CS_PIN));
 
+       AO_CC1120_SPI_CS_PORT.bsrr = ((uint32_t) (1 << AO_CC1120_SPI_CS_PIN));
+       for (i = 0; i < 10000; i++) {
+               if ((SPI_2_GPIO.idr & (1 << SPI_2_MISO)) == 0)
+                       break;
+       }
+       AO_CC1120_SPI_CS_PORT.bsrr = (1 << AO_CC1120_SPI_CS_PIN);
+       if (i == 10000)
+               ao_panic(AO_PANIC_SELF_TEST);
        ao_cmd_register(&ao_radio_cmds[0]);
 }