X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1120.c;h=f27958f96ae397776248f17a64f1f687da780b0b;hb=defd5d0784a754be30e3295067fbc85a108ad172;hp=2f9c296f25372926f99a92e88cf8ab593ad8a539;hpb=f9af7819de086d9179c3a4d1df7c88ab67a7d7c7;p=fw%2Faltos

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 2f9c296f..f27958f9 100644
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -21,6 +21,9 @@
 #include <ao_fec.h>
 #include <ao_packet.h>
 
+#define AO_RADIO_MAX_RECV	sizeof(struct ao_packet)
+#define AO_RADIO_MAX_SEND	sizeof(struct ao_packet)
+
 uint8_t ao_radio_wake;
 uint8_t ao_radio_mutex;
 uint8_t ao_radio_abort;
@@ -466,10 +469,10 @@ ao_rdf_run(void)
 {
 	ao_radio_start_tx();
 
-	cli();
+	ao_arch_block_interrupts();
 	while (!ao_radio_wake && !ao_radio_abort)
 		ao_sleep(&ao_radio_wake);
-	sei();
+	ao_arch_release_interrupts();
 	if (!ao_radio_wake)
 		ao_radio_idle();
 	ao_radio_put();
@@ -518,7 +521,7 @@ static void
 ao_radio_test_cmd(void)
 {
 	uint8_t	mode = 2;
-	uint8_t radio_on;
+	static uint8_t radio_on;
 	ao_cmd_white();
 	if (ao_cmd_lex_c != '\n') {
 		ao_cmd_decimal();
@@ -559,18 +562,19 @@ ao_radio_test_cmd(void)
 	}
 }
 
+static uint8_t	tx_data[(AO_RADIO_MAX_SEND + 4) * 2];
+
 void
 ao_radio_send(const void *d, uint8_t size)
 {
 	uint8_t		marc_status;
-	static uint8_t	encode[256];
-	uint8_t		*e = encode;
+	uint8_t		*e = tx_data;
 	uint8_t		encode_len;
 	uint8_t		this_len;
 	uint8_t		started = 0;
 	uint8_t		fifo_space;
 
-	encode_len = ao_fec_encode(d, size, encode);
+	encode_len = ao_fec_encode(d, size, tx_data);
 
 	ao_radio_get(encode_len);
 
@@ -599,10 +603,10 @@ ao_radio_send(const void *d, uint8_t size)
 			
 		do {
 			ao_radio_wake = 0;
-			cli();
+			ao_arch_block_interrupts();
 			while (!ao_radio_wake)
 				ao_sleep(&ao_radio_wake);
-			sei();
+			ao_arch_release_interrupts();
 			if (!encode_len)
 				break;
 			fifo_space = ao_radio_tx_fifo_space();
@@ -611,8 +615,6 @@ ao_radio_send(const void *d, uint8_t size)
 	ao_radio_put();
 }
 
-#define AO_RADIO_MAX_RECV	90
-
 static uint8_t	rx_data[(AO_RADIO_MAX_RECV + 4) * 2 * 8];
 static uint16_t	rx_data_count;
 static uint16_t	rx_data_consumed;
@@ -658,14 +660,14 @@ ao_radio_rx_isr(void)
 static uint16_t
 ao_radio_rx_wait(void)
 {
-	cli();
+	ao_arch_block_interrupts();
 	rx_waiting = 1;
 	while (rx_data_cur - rx_data_consumed < AO_FEC_DECODE_BLOCK &&
 	       !ao_radio_abort) {
 		ao_sleep(&ao_radio_wake);
 	}
 	rx_waiting = 0;
-	sei();
+	ao_arch_release_interrupts();
 	if (ao_radio_abort)
 		return 0;
 	rx_data_consumed += AO_FEC_DECODE_BLOCK;
@@ -1026,6 +1028,7 @@ ao_radio_init(void)
 	ao_radio_configured = 0;
 	ao_spi_init_cs (AO_CC1120_SPI_CS_PORT, (1 << AO_CC1120_SPI_CS_PIN));
 
+#if 0
 	AO_CC1120_SPI_CS_PORT->bsrr = ((uint32_t) (1 << AO_CC1120_SPI_CS_PIN));
 	for (i = 0; i < 10000; i++) {
 		if ((SPI_2_PORT->idr & (1 << SPI_2_MISO_PIN)) == 0)
@@ -1034,6 +1037,7 @@ ao_radio_init(void)
 	AO_CC1120_SPI_CS_PORT->bsrr = (1 << AO_CC1120_SPI_CS_PIN);
 	if (i == 10000)
 		ao_panic(AO_PANIC_SELF_TEST_CC1120);
+#endif
 
 	/* Enable the EXTI interrupt for the appropriate pin */
 	ao_enable_port(AO_CC1120_INT_PORT);