1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2025-04-21 12:27:27 +03:00

Merged uSD driver into unified tool build, completed conversion of tools.

- atusd/tools/lib/atusd.c: moved to tools/lib/
- atusd/tools/lib/atusd.h: removed, we can now use tools/include/atspi.h
- tools/lib/atusd.c: added copyright header
- tools/lib/atusd.c: updated for driver API
- tools/lib/Makefile: added atusd.o
- tools/Makefile.common: moved common elements from all other makefiles in
  tools/*/ here
- tools/Makefile.common: added target-specific compiler and flags
- tools/atspi-id/Makefile, tools/atspi-reset/Makefile,
  tools/atspi-rssi/Makefile, tools/atspi-trim/Makefile,
  tools/atspi-txrx/Makefile, tools/lib/Makefile: used Makefile.common
- tools/lib/Makefile: differentiate USB and uSD build
- tools/atspi-id/atspi-id.c, tools/atspi-reset/atspi-reset.c,
  tools/atspi-rssi/atspi-rssi.c, tools/atspi-trim/atspi-trim.c,
  tools/atspi-txr/atspi-txr.c: updated for driver-agnostic API
- tools/atspi-id/atspi-id.c, tools/atspi-reset/atspi-reset.c,
  tools/atspi-rssi/atspi-rssi.c, tools/atspi-trim/atspi-trim.c,
  tools/atspi-txr/atspi-txr.c: corrected AF86RF230 typo in title
- tools/include/atspi.h, tools/lib/atspi.c, tools/lib/driver.c,
  tools/lib/atusb.c: brought back support for atspi_error and
  atspi_clear_error
- tools/atspi-id/atspi-id.c (atspi_get_protocol): renamed to get_protocol,
  to make it clear that it's not from libatspi
- tools/atspi-id/atspi-id.c (atspi_get_build): renamed to get_build, to
  make it clear that it's not from libatspi
- tools/include/atspi.h, tools/lib/atspi.c (atspi_usb_handle): new function
  to obtain a driver's USB device handle (or NULL if the driver doesn't use
  USB)
This commit is contained in:
Werner Almesberger
2010-09-05 20:32:58 -03:00
parent e2b2df2e31
commit f20d685f8e
18 changed files with 289 additions and 200 deletions

View File

@@ -11,11 +11,6 @@
#
F32XBASE = ../../../f32xbase
MAIN = atspi-rssi
include $(F32XBASE)/lib/Makefile.common
CFLAGS += -I../../atrf/fw/include -I../include
LDLIBS += -L../lib -latspi
include ../Makefile.common

View File

@@ -1,5 +1,5 @@
/*
* atspi-rssi/atspi-rssi.c - ben-wpan AF86RF230 spectrum scan
* atspi-rssi/atspi-rssi.c - ben-wpan AT86RF230 spectrum scan
*
* Written 2010 by Werner Almesberger
* Copyright 2010 Werner Almesberger
@@ -13,7 +13,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <usb.h>
#include <sys/time.h>
#include "at86rf230.h"
@@ -24,19 +23,19 @@
static struct timeval t0;
static void sweep(usb_dev_handle *dev)
static void sweep(struct atspi_dsc *dsc)
{
int chan, rssi;
struct timeval t;
for (chan = 11; chan <= 26; chan++) {
atspi_reg_write(dev, REG_PHY_CC_CCA, chan);
atspi_reg_write(dsc, REG_PHY_CC_CCA, chan);
/*
* No need to explicitly wait for the PPL lock - going USB-SPI
* is pretty slow, leaving the transceiver plenty of time.
*/
gettimeofday(&t, NULL);
rssi = atspi_reg_read(dev, REG_PHY_RSSI) & RSSI_MASK;
rssi = atspi_reg_read(dsc, REG_PHY_RSSI) & RSSI_MASK;
t.tv_sec -= t0.tv_sec;
t.tv_usec -= t0.tv_usec;
printf("%d %f %d\n",
@@ -57,7 +56,7 @@ static void usage(const char *name)
int main(int argc, const char **argv)
{
usb_dev_handle *dev;
struct atspi_dsc *dsc;
unsigned long sweeps, i;
char *end;
@@ -67,22 +66,22 @@ int main(int argc, const char **argv)
if (*end)
usage(*argv);
dev = atspi_open();
if (!dev)
dsc = atspi_open();
if (!dsc)
return 1;
atspi_reg_write(dev, 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(dev, REG_TRX_STATE, TRX_CMD_RX_ON);
atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_RX_ON);
gettimeofday(&t0, NULL);
for (i = 0; i != sweeps; i++)
sweep(dev);
sweep(dsc);
atspi_reg_write(dev, REG_TRX_STATE, TRX_CMD_TRX_OFF);
atspi_reg_write(dsc, REG_TRX_STATE, TRX_CMD_TRX_OFF);
return 0;
}