X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1200.c;h=ed1d298e1b4a8c100950da114c7ab45ed8abbce0;hb=HEAD;hp=799f808fc0105b69d9acbcdcd951758c252f6f36;hpb=05aacbd4a37d8bbe5b89664fc3630ffc4096ec69;p=fw%2Faltos

diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c
index 799f808f..ed1d298e 100644
--- a/src/drivers/ao_cc1200.c
+++ b/src/drivers/ao_cc1200.c
@@ -53,7 +53,7 @@ extern const uint32_t	ao_radio_cal;
 #define FOSC	40000000
 #endif
 
-#define AO_CC1200_SPI_SPEED	ao_spi_speed(7700000)	/* 7.7MHz max for extended memory reads */
+#define AO_CC1200_SPI_SPEED	ao_spi_speed(AO_CC1200_SPI_BUS, 7700000)	/* 7.7MHz max for extended memory reads */
 
 #define ao_radio_select()	ao_spi_get_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS,AO_CC1200_SPI_SPEED)
 #define ao_radio_deselect()	ao_spi_put_mask(AO_CC1200_SPI_CS_PORT,(1 << AO_CC1200_SPI_CS_PIN),AO_CC1200_SPI_BUS)
@@ -65,7 +65,7 @@ extern const uint32_t	ao_radio_cal;
 static uint8_t
 ao_radio_reg_read(uint16_t addr)
 {
-	uint8_t	data[2];
+	uint8_t	data[3];
 	uint8_t	d;
 
 #if CC1200_TRACE
@@ -84,13 +84,12 @@ ao_radio_reg_read(uint16_t addr)
 		d = 1;
 	}
 	ao_radio_select();
-	ao_radio_spi_send(data, d);
-	ao_radio_spi_recv(data, 1);
+	ao_radio_duplex(data, data, d + 1);
 	ao_radio_deselect();
 #if CC1200_TRACE
-	printf (" %02x\n", data[0]);
+	printf (" %02x\n", data[d]);
 #endif
-	return data[0];
+	return data[d];
 }
 
 static void