X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_cc115l.c;h=d9b9a89b7f29649a147203abe06277711a95f367;hb=3d5db24708b37d86eac187169e2553a408dfeb83;hp=0fa1e899044a23fae470cbaa7ac1b9a657b84014;hpb=e2f385946132690ca6dc141d7c7830ae0cfe3458;p=fw%2Faltos

diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index 0fa1e899..d9b9a89b 100644
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -29,8 +29,6 @@ static uint8_t ao_radio_fifo;		/* fifo drained interrupt received */
 static uint8_t ao_radio_done;		/* tx done interrupt received */
 static uint8_t ao_radio_wake;		/* sleep address for radio interrupts */
 static uint8_t ao_radio_abort;		/* radio operation should abort */
-static uint8_t ao_radio_mcu_wake;	/* MARC status change */
-static uint8_t ao_radio_marcstate;	/* Last read MARC state value */
 
 /* Debugging commands */
 #define CC115L_DEBUG	0
@@ -54,8 +52,8 @@ struct ao_cc115l_reg {
 
 #if CC115L_TRACE
 
-const static struct ao_cc115l_reg ao_cc115l_reg[];
-const static char *cc115l_state_name[];
+static const struct ao_cc115l_reg ao_cc115l_reg[];
+static const char *cc115l_state_name[];
 
 enum ao_cc115l_trace_type {
 	trace_strobe,
@@ -90,6 +88,8 @@ static void trace_add(enum ao_cc115l_trace_type type, int16_t addr, int16_t valu
 	case trace_strobe:
 		comment = cc115l_state_name[(value >> 4) & 0x7];
 		break;
+	default:
+		break;
 	}
 	trace[trace_i].type = type;
 	trace[trace_i].addr = addr;
@@ -106,7 +106,6 @@ static uint8_t
 ao_radio_reg_read(uint8_t addr)
 {
 	uint8_t	data[1];
-	uint8_t	d;
 
 	data[0] = ((1 << CC115L_READ)  |
 		   (0 << CC115L_BURST) |
@@ -123,7 +122,6 @@ static void
 ao_radio_reg_write(uint8_t addr, uint8_t value)
 {
 	uint8_t	data[2];
-	uint8_t	d;
 
 	trace_add(trace_write, addr, value, NULL);
 	data[0] = ((0 << CC115L_READ)  |
@@ -135,11 +133,11 @@ ao_radio_reg_write(uint8_t addr, uint8_t value)
 	ao_radio_deselect();
 }
 
+#if UNUSED
 static void
 ao_radio_burst_read_start (uint16_t addr)
 {
 	uint8_t data[1];
-	uint8_t d;
 
 	data[0] = ((1 << CC115L_READ)  |
 		   (1 << CC115L_BURST) |
@@ -153,6 +151,7 @@ ao_radio_burst_read_stop (void)
 {
 	ao_radio_deselect();
 }
+#endif
 
 
 static uint8_t
@@ -200,20 +199,22 @@ ao_radio_tx_fifo_space(void)
 	return CC115L_FIFO_SIZE - (ao_radio_reg_read(CC115L_TXBYTES) & CC115L_TXBYTES_NUM_TX_BYTES_MASK);
 }
 
+#if CC115L_DEBUG
 static uint8_t
 ao_radio_status(void)
 {
 	return ao_radio_strobe (CC115L_SNOP);
 }
 
-#define ao_radio_rdf_value 0x55
-
 static uint8_t
 ao_radio_get_marcstate(void)
 {
 	return ao_radio_reg_read(CC115L_MARCSTATE) & CC115L_MARCSTATE_MASK;
 }
-	  
+#endif
+
+#define ao_radio_rdf_value 0x55
+
 static void
 ao_radio_done_isr(void)
 {
@@ -232,11 +233,6 @@ ao_radio_fifo_isr(void)
 	ao_wakeup(&ao_radio_wake);
 }
 
-static void
-ao_radio_start_tx(void)
-{
-}
-
 static void
 ao_radio_idle(void)
 {
@@ -401,7 +397,7 @@ static void
 ao_radio_set_mode(uint16_t new_mode)
 {
 	uint16_t changes;
-	int i;
+	unsigned int i;
 
 	if (new_mode == ao_radio_mode)
 		return;
@@ -466,7 +462,7 @@ static uint8_t	ao_radio_configured = 0;
 static void
 ao_radio_setup(void)
 {
-	int	i;
+	unsigned int	i;
 
 	ao_radio_strobe(CC115L_SRES);
 	ao_delay(AO_MS_TO_TICKS(10));
@@ -568,6 +564,7 @@ ao_radio_tone_run(struct ao_radio_tone *tones, int ntones)
 	ao_radio_tone = tones;
 	ao_radio_tone_current = 0;
 	ao_radio_tone_offset = 0;
+	ao_radio_tone_count = ntones;
 	_ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
 	ao_radio_put();
 }
@@ -671,8 +668,8 @@ ao_radio_test_cmd(void)
 static inline int16_t
 ao_radio_gpio_bits(void)
 {
-	return AO_CC115L_DONE_INT_PORT->idr & ((1 << AO_CC115L_FIFO_INT_PIN) |
-					       (1 << AO_CC115L_DONE_INT_PIN));
+	return ((ao_gpio_get(AO_CC115L_DONE_INT_PORT, AO_CC115L_DONE_INT_PIN, AO_CC115L_DONE_INT) << 1) |
+		ao_gpio_get(AO_CC115L_FIFO_INT_PORT, AO_CC115L_FIFO_INT_PIN, AO_CC115L_FIFO_INT));
 }
 #endif
 
@@ -730,8 +727,6 @@ ao_radio_send_fill(uint8_t *buf, int16_t len)
 void
 ao_radio_send(const void *d, uint8_t size)
 {
-	int i;
-
 	ao_radio_get();
 	ao_radio_send_len = ao_fec_encode(d, size, tx_data);
 	ao_radio_send_buf = tx_data;
@@ -824,7 +819,7 @@ ao_radio_send_aprs(ao_radio_fill_func fill)
 }
 
 #if CC115L_DEBUG
-const static char *cc115l_state_name[] = {
+static const char *cc115l_state_name[] = {
 	[CC115L_STATUS_STATE_IDLE] = "IDLE",
 	[CC115L_STATUS_STATE_TX] = "TX",
 	[CC115L_STATUS_STATE_FSTXON] = "FSTXON",
@@ -833,7 +828,7 @@ const static char *cc115l_state_name[] = {
 	[CC115L_STATUS_STATE_TX_FIFO_UNDERFLOW] = "TX_FIFO_UNDERFLOW",
 };
 
-const static struct ao_cc115l_reg ao_cc115l_reg[] = {
+static const struct ao_cc115l_reg ao_cc115l_reg[] = {
 	{ .addr = CC115L_IOCFG2, .name = "IOCFG2" },
 	{ .addr = CC115L_IOCFG1, .name = "IOCFG1" },
 	{ .addr = CC115L_IOCFG0, .name = "IOCFG0" },
@@ -879,7 +874,7 @@ const static struct ao_cc115l_reg ao_cc115l_reg[] = {
 
 static void ao_radio_show(void) {
 	uint8_t	status = ao_radio_status();
-	int	i;
+	unsigned int	i;
 
 	ao_radio_get();
 	status = ao_radio_status();
@@ -912,7 +907,6 @@ static void ao_radio_packet(void) {
 	ao_radio_send(packet, sizeof (packet));
 }
 
-#endif /* CC115L_DEBUG */
 
 #if HAS_APRS
 #include <ao_aprs.h>
@@ -926,6 +920,7 @@ ao_radio_aprs()
 	ao_aprs_send();
 }
 #endif
+#endif /* CC115L_DEBUG */
 
 static const struct ao_cmds ao_radio_cmds[] = {
 	{ ao_radio_test_cmd,	"C <1 start, 0 stop, none both>\0Radio carrier test" },
@@ -943,7 +938,9 @@ static const struct ao_cmds ao_radio_cmds[] = {
 void
 ao_radio_init(void)
 {
+#if 0
 	int	i;
+#endif
 
 	ao_radio_configured = 0;
 	ao_spi_init_cs (AO_CC115L_SPI_CS_PORT, (1 << AO_CC115L_SPI_CS_PIN));