From: Keith Packard <keithp@keithp.com>
Date: Fri, 11 Jan 2013 05:48:12 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/micropeak-logging'
X-Git-Tag: 1.1.9.3~8^2~9
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e;hp=-c

Merge remote-tracking branch 'origin/micropeak-logging'
---

1ed6b13e87c1cc2d6618b6ba3a293ea6e3b5752e
diff --combined src/drivers/ao_cc1120.c
index 35be54a4,d9b2e5bf..8068740f
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@@ -834,8 -834,8 +834,8 @@@ ao_radio_rx_isr(void
  {
  	uint8_t	d;
  
- 	d = stm_spi2.dr;
- 	stm_spi2.dr = 0;
+ 	d = AO_CC1120_SPI.dr;
+ 	AO_CC1120_SPI.dr = 0;
  	if (rx_ignore == 0) {
  		if (rx_data_cur >= rx_data_count)
  			ao_exti_disable(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
@@@ -862,7 -862,6 +862,7 @@@ ao_radio_rx_wait(void
  	do {
  		if (ao_radio_mcu_wake)
  			ao_radio_check_marc_status();
 +		ao_alarm(AO_MS_TO_TICKS(100));
  		ao_arch_block_interrupts();
  		rx_waiting = 1;
  		while (rx_data_cur - rx_data_consumed < AO_FEC_DECODE_BLOCK &&
@@@ -874,7 -873,6 +874,7 @@@
  		}
  		rx_waiting = 0;
  		ao_arch_release_interrupts();
 +		ao_clear_alarm();
  	} while (ao_radio_mcu_wake);
  	if (ao_radio_abort)
  		return 0;
@@@ -924,10 -922,10 +924,10 @@@ ao_radio_recv(__xdata void *d, uint8_t 
  	ao_radio_wake = 0;
  	ao_radio_mcu_wake = 0;
  
- 	stm_spi2.cr2 = 0;
+ 	AO_CC1120_SPI.cr2 = 0;
  
  	/* clear any RXNE */
- 	(void) stm_spi2.dr;
+ 	(void) AO_CC1120_SPI.dr;
  
  	/* Have the radio signal when the preamble quality goes high */
  	ao_radio_reg_write(AO_CC1120_INT_GPIO_IOCFG, CC1120_IOCFG_GPIO_CFG_PQT_REACHED);