projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
[fw/altos]
/
src
/
ao_radio.c
diff --git
a/src/ao_radio.c
b/src/ao_radio.c
index 1a0cf4fa2dee22546c5ea6c75f916cf6b411a584..f4a9d3b265edb1a82ea37ee95cac9568022da9c6 100644
(file)
--- a/
src/ao_radio.c
+++ b/
src/ao_radio.c
@@
-275,7
+275,7
@@
__xdata uint8_t ao_radio_done;
__xdata uint8_t ao_radio_mutex;
void
__xdata uint8_t ao_radio_mutex;
void
-ao_radio_general_isr(void) interrupt 16
+ao_radio_general_isr(void)
__
interrupt 16
{
S1CON &= ~0x03;
if (RFIF & RFIF_IM_TIMEOUT) {
{
S1CON &= ~0x03;
if (RFIF & RFIF_IM_TIMEOUT) {
@@
-317,8
+317,8
@@
ao_radio_idle(void)
{
if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
{
{
if (RF_MARCSTATE != RF_MARCSTATE_IDLE)
{
- RFST = RFST_SIDLE;
do {
do {
+ RFST = RFST_SIDLE;
ao_yield();
} while (RF_MARCSTATE != RF_MARCSTATE_IDLE);
}
ao_yield();
} while (RF_MARCSTATE != RF_MARCSTATE_IDLE);
}
@@
-448,6
+448,7
@@
ao_radio_rdf_abort(void)
void
ao_radio_test(void)
{
void
ao_radio_test(void)
{
+ ao_set_monitor(0);
ao_packet_slave_stop();
ao_radio_get();
printf ("Hit a character to stop..."); flush();
ao_packet_slave_stop();
ao_radio_get();
printf ("Hit a character to stop..."); flush();