qi-hardware/ben-wpan
1
0
Fork 0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-11-26 07:51:53 +02:00
Code

atspi-rssi cleanup: wait for interrupt, exit cleanly.

Browse Source 
- tools/atspi-rssi/atspi-rssi.c: removed unnecessary inclusion of
  atspi/ep0.h
- tools/atspi-rssi/atspi-rssi.c (sweep): instead of fixed delay, wait for
  the PLL lock interrupt
- tools/atspi-rssi/atspi-rssi.c (die, main): catch SIGINT to exit cleanly
- tools/atspi-rssi/atspi-rssi.c (main): shut down properly when done
- tools/atspi-rssi/atspi-rssi.c (usage): print "usage:" before the program's
  name
This commit is contained in:
Werner Almesberger 2010-09-09 17:56:04 -03:00
parent 2a245e1ee3
commit 4df6d2c2f9
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/atspi-rssi/atspi-rssi.c
View File

@ -13,14 +13,16 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <signal.h>
#include <sys/time.h> #include <sys/time.h>
#include "at86rf230.h" #include "at86rf230.h"
#include "atspi/ep0.h"
#include "atspi.h" #include "atspi.h"
#include "misctxrx.h"
static struct timeval t0; static struct timeval t0;
static volatile int run = 1;
static void sweep(struct atspi_dsc *dsc) static void sweep(struct atspi_dsc *dsc)
@ -31,7 +33,8 @@ static void sweep(struct atspi_dsc *dsc)
for (chan = 11; chan <= 26; chan++) { for (chan = 11; chan <= 26; chan++) {
atspi_reg_write(dsc, REG_PHY_CC_CCA, chan); atspi_reg_write(dsc, REG_PHY_CC_CCA, chan);
/* 150 us, according to AVR2001 section 3.5 */ /* 150 us, according to AVR2001 section 3.5 */
usleep(1000); wait_for_interrupt(dsc, IRQ_PLL_LOCK, IRQ_PLL_LOCK, 10, 20);
/* /*
* No need to explicitly wait for the PPL lock - going USB-SPI * No need to explicitly wait for the PPL lock - going USB-SPI
* is pretty slow, leaving the transceiver plenty of time. * is pretty slow, leaving the transceiver plenty of time.
@ -49,9 +52,15 @@ static void sweep(struct atspi_dsc *dsc)
} }
static void die(int sig)
{
run = 0;
}
static void usage(const char *name) static void usage(const char *name)
{ {
fprintf(stderr, "%s sweeps \n", name); fprintf(stderr, "usage: %s sweeps \n", name);
exit(1); exit(1);
} }
@ -68,22 +77,25 @@ int main(int argc, const char **argv)
if (*end) if (*end)
usage(*argv); usage(*argv);
signal(SIGINT, die);
dsc = atspi_open(); dsc = atspi_open();
if (!dsc) if (!dsc)
return 1; return 1;
atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF); atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF);
/*
* No need to explicitly wait for things to stabilize - going USB-SPI
* is pretty slow, leaving the transceiver more than enough time.
*/
atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_RX_ON); atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_RX_ON);
/*
* We'll wait for the PLL lock after selecting the channel.
*/
gettimeofday(&t0, NULL); gettimeofday(&t0, NULL);
for (i = 0; i != sweeps; i++) for (i = 0; run && i != sweeps; i++)
sweep(dsc); sweep(dsc);
atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF); atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF);
atspi_close(dsc);
return 0; return 0;
} }