projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Switch drivers to ao_arch_block/release_interrupts
[fw/altos]
/
src
/
drivers
/
ao_packet.c
diff --git
a/src/drivers/ao_packet.c
b/src/drivers/ao_packet.c
index e020c0030ce0dffd6e8ef4da383a40397f50ed77..3c1e7a18eb643168be3520e558f0ee6781ce963f 100644
(file)
--- a/
src/drivers/ao_packet.c
+++ b/
src/drivers/ao_packet.c
@@
-27,7
+27,12
@@
static __pdata uint8_t rx_seq;
__xdata struct ao_task ao_packet_task;
__xdata uint8_t ao_packet_enable;
__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;
__xdata uint8_t ao_packet_master_sleeping;
+__xdata uint8_t ao_packet_last_rssi;
+#endif
void
ao_packet_send(void)
void
ao_packet_send(void)
@@
-80,6
+85,9
@@
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
*/
@@
-99,7
+107,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
@@
-119,6
+128,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
@@
-130,10
+140,6
@@
ao_packet_recv(void)
return 1;
}
return 1;
}
-#ifndef PACKET_HAS_MASTER
-#define PACKET_HAS_MASTER 1
-#endif
-
#if PACKET_HAS_MASTER
void
ao_packet_flush(void)
#if PACKET_HAS_MASTER
void
ao_packet_flush(void)
@@
-149,6
+155,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();
@@
-161,8
+170,11
@@
ao_packet_putchar(char c) __reentrant
}
char
}
char
-ao_packet_pollchar(void)
__critical
+ao_packet_pollchar(void)
{
{
+ /* No need to block interrupts, all variables here
+ * are only manipulated in task context
+ */
if (!ao_packet_enable)
return AO_READ_AGAIN;
if (!ao_packet_enable)
return AO_READ_AGAIN;