X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1200.c;h=6afa2a2112e9d0c73c0936d7b67f4b5eb8276651;hb=8a830c7f9ed41565c72edb85852e2df8bfa351f5;hp=105e0d50a80aa072a2147248d1cf57edd4a0e8e2;hpb=0686a7b8aec524d81bda4c572549a3a068ce0eed;p=fw%2Faltos

diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c
index 105e0d50..6afa2a21 100644
--- a/src/drivers/ao_cc1200.c
+++ b/src/drivers/ao_cc1200.c
@@ -25,6 +25,8 @@
 #include <ao_pad.h>
 #endif
 
+static uint8_t cc1201;
+
 static uint8_t ao_radio_mutex;
 
 static uint8_t ao_radio_wake;		/* radio ready. Also used as sleep address */
@@ -51,9 +53,7 @@ extern const uint32_t	ao_radio_cal;
 #define FOSC	40000000
 #endif
 
-#ifndef AO_CC1200_SPI_SPEED
-#error AO_CC1200_SPI_SPEED undefined
-#endif
+#define AO_CC1200_SPI_SPEED	ao_spi_speed(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)
@@ -665,6 +665,11 @@ static uint8_t	ao_radio_configured = 0;
 static void
 ao_radio_setup(void)
 {
+	uint8_t partnumber = ao_radio_reg_read(CC1200_PARTNUMBER);
+
+	if (partnumber == CC1200_PARTNUMBER_CC1201)
+		cc1201 = 1;
+
 	ao_radio_strobe(CC1200_SRES);
 
 	ao_radio_set_regs(radio_setup);
@@ -721,8 +726,8 @@ ao_radio_state(void)
 	return (ao_radio_status() >> CC1200_STATUS_STATE) & CC1200_STATUS_STATE_MASK;
 }
 
-#if CC1200_DEBUG
-void
+#if CC1200_DEBUG_
+static void
 ao_radio_show_state(char *where)
 {
 	printf("%s: state %d len %d rxbytes %d\n",
@@ -1322,7 +1327,7 @@ static void ao_radio_packet(void) {
 	ao_radio_send(packet, sizeof (packet));
 }
 
-void
+static void
 ao_radio_test_recv(void)
 {
 	static uint8_t	bytes[34];