projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Fetch current quadrature status at startup time
[fw/altos]
/
src
/
drivers
/
ao_packet.c
diff --git
a/src/drivers/ao_packet.c
b/src/drivers/ao_packet.c
index d813b25f27448c43c3707dc0f46d689b4024f94b..008af5db000ca164135f1ed37c17a59896d14215 100644
(file)
--- a/
src/drivers/ao_packet.c
+++ b/
src/drivers/ao_packet.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-21,16
+22,16
@@
__xdata struct ao_packet_recv ao_rx_packet;
__xdata struct ao_packet ao_tx_packet;
__pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
__xdata struct ao_packet ao_tx_packet;
__pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
-static __xdata
char
tx_data[AO_PACKET_MAX];
-static __xdata
char
rx_data[AO_PACKET_MAX];
+static __xdata
uint8_t
tx_data[AO_PACKET_MAX];
+static __xdata
uint8_t
rx_data[AO_PACKET_MAX];
static __pdata uint8_t rx_seq;
__xdata struct ao_task ao_packet_task;
__xdata uint8_t ao_packet_enable;
static __pdata uint8_t rx_seq;
__xdata struct ao_task ao_packet_task;
__xdata uint8_t ao_packet_enable;
+__xdata uint8_t ao_packet_restart;
#if PACKET_HAS_MASTER
__xdata uint8_t ao_packet_master_sleeping;
#if PACKET_HAS_MASTER
__xdata uint8_t ao_packet_master_sleeping;
-__xdata uint8_t ao_packet_last_rssi;
#endif
void
#endif
void
@@
-54,14
+55,14
@@
ao_packet_send(void)
}
uint8_t
}
uint8_t
-ao_packet_recv(
void
)
+ao_packet_recv(
uint16_t timeout
)
{
uint8_t dma_done;
#ifdef AO_LED_GREEN
ao_led_on(AO_LED_GREEN);
#endif
{
uint8_t dma_done;
#ifdef AO_LED_GREEN
ao_led_on(AO_LED_GREEN);
#endif
- dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv));
+ dma_done = ao_radio_recv(&ao_rx_packet, sizeof (struct ao_packet_recv)
, timeout
);
#ifdef AO_LED_GREEN
ao_led_off(AO_LED_GREEN);
#endif
#ifdef AO_LED_GREEN
ao_led_off(AO_LED_GREEN);
#endif
@@
-84,9
+85,6
@@
ao_packet_recv(void)
if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
return 0;
if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
return 0;
-#if PACKET_HAS_MASTER
- ao_packet_last_rssi = ao_rx_packet.rssi;
-#endif
/* Accept packets with matching call signs, or any packet if
* our callsign hasn't been configured
*/
/* Accept packets with matching call signs, or any packet if
* our callsign hasn't been configured
*/
@@
-106,7
+104,8
@@
ao_packet_recv(void)
/* Check for incoming data at the next sequence and
* for an empty data buffer
*/
/* Check for incoming data at the next sequence and
* for an empty data buffer
*/
- if (ao_rx_packet.packet.seq == (uint8_t) (rx_seq + (uint8_t) 1) &&
+ if ((ao_rx_packet.packet.seq == (uint8_t) (rx_seq + (uint8_t) 1) ||
+ ao_packet_restart) &&
ao_packet_rx_used == ao_packet_rx_len) {
/* Copy data to the receive data buffer and set up the
ao_packet_rx_used == ao_packet_rx_len) {
/* Copy data to the receive data buffer and set up the
@@
-126,6
+125,7
@@
ao_packet_recv(void)
ao_wakeup(&ao_stdin_ready);
}
}
ao_wakeup(&ao_stdin_ready);
}
}
+ ao_packet_restart = 0;
/* If the other side has seen the latest data we queued,
* wake up any task waiting to send data and let them go again
/* If the other side has seen the latest data we queued,
* wake up any task waiting to send data and let them go again
@@
-152,6
+152,9
@@
ao_packet_flush(void)
void
ao_packet_putchar(char c) __reentrant
{
void
ao_packet_putchar(char c) __reentrant
{
+ /* No need to block interrupts, all variables here
+ * are only manipulated in task context
+ */
while (ao_packet_tx_used == AO_PACKET_MAX && ao_packet_enable) {
#if PACKET_HAS_MASTER
ao_packet_flush();
while (ao_packet_tx_used == AO_PACKET_MAX && ao_packet_enable) {
#if PACKET_HAS_MASTER
ao_packet_flush();
@@
-163,8
+166,9
@@
ao_packet_putchar(char c) __reentrant
tx_data[ao_packet_tx_used++] = c;
}
tx_data[ao_packet_tx_used++] = c;
}
-char
-ao_packet_pollchar(void) __critical
+/* May be called with interrupts blocked */
+int
+_ao_packet_pollchar(void)
{
if (!ao_packet_enable)
return AO_READ_AGAIN;
{
if (!ao_packet_enable)
return AO_READ_AGAIN;