X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc1200.c;h=6afa2a2112e9d0c73c0936d7b67f4b5eb8276651;hb=ea0ab578e4e745f4ee94c2551834e105152fdba1;hp=de282000ad95eeefd5a48d93ba3f5b717092ba61;hpb=1dc31a46f1d1adfdeab444664e581a780d995bf7;p=fw%2Faltos

diff --git a/src/drivers/ao_cc1200.c b/src/drivers/ao_cc1200.c
index de282000..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)
@@ -192,7 +192,7 @@ ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
 static uint8_t
 ao_radio_int_pin(void)
 {
-	return ao_gpio_get(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN, AO_CC1200_INT);
+	return ao_gpio_get(AO_CC1200_INT_PORT, AO_CC1200_INT_PIN);
 }
 
 static uint8_t
@@ -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",
@@ -858,10 +863,8 @@ ao_radio_test_cmd(void)
 {
 	uint8_t	mode = 2;
 	ao_cmd_white();
-	if (ao_cmd_lex_c != '\n') {
-		ao_cmd_decimal();
-		mode = (uint8_t) ao_cmd_lex_u32;
-	}
+	if (ao_cmd_lex_c != '\n')
+		mode = ao_cmd_decimal();
 	mode++;
 	if ((mode & 2))
 		ao_radio_test_on();
@@ -988,7 +991,7 @@ ao_radio_dump_state(struct ao_radio_state *s)
 #endif
 
 uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
+ao_radio_recv(void *d, uint8_t size, uint8_t timeout)
 {
 	uint8_t	success = 0;
 
@@ -1324,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];
@@ -1362,14 +1365,15 @@ ao_radio_aprs(void)
 static void
 ao_radio_strobe_test(void)
 {
+	uint8_t addr;
 	uint8_t	r;
 
-	ao_cmd_hex();
+	addr = ao_cmd_hex();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	r = ao_radio_strobe(ao_cmd_lex_i);
+	r = ao_radio_strobe(addr);
 	printf ("Strobe %02x -> %02x (rdy %d state %d)\n",
-		ao_cmd_lex_i,
+		addr,
 		r,
 		r >> 7,
 		(r >> 4) & 0x7);
@@ -1381,14 +1385,12 @@ ao_radio_write_test(void)
 	uint16_t	addr;
 	uint8_t		data;
 
-	ao_cmd_hex();
+	addr = ao_cmd_hex();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	addr = ao_cmd_lex_i;
-	ao_cmd_hex();
+	data = ao_cmd_hex();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	data = ao_cmd_lex_i;
 	printf ("Write %04x = %02x\n", addr, data);
 	ao_radio_reg_write(addr, data);
 }
@@ -1399,10 +1401,9 @@ ao_radio_read_test(void)
 	uint16_t	addr;
 	uint8_t		data;
 
-	ao_cmd_hex();
+	addr = ao_cmd_hex();
 	if (ao_cmd_status != ao_cmd_success)
 		return;
-	addr = ao_cmd_lex_i;
 	data = ao_radio_reg_read(addr);
 	printf ("Read %04x = %02x\n", addr, data);
 }