2010-08-20 21:09:45 +03:00
|
|
|
/*
|
2010-11-11 15:24:22 +02:00
|
|
|
* atrf-id/atrf-id.c - Identify a ben-wpan AT86RF230 board
|
2010-08-20 21:09:45 +03:00
|
|
|
*
|
2011-01-07 17:35:51 +02:00
|
|
|
* Written 2010-2011 by Werner Almesberger
|
|
|
|
* Copyright 2010-2011 Werner Almesberger
|
2010-08-20 21:09:45 +03:00
|
|
|
*
|
|
|
|
* 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; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
#include <unistd.h>
|
2010-09-06 02:51:07 +03:00
|
|
|
|
|
|
|
#ifdef HAVE_USB
|
2010-08-20 22:27:24 +03:00
|
|
|
#include <usb.h>
|
2010-09-06 02:51:07 +03:00
|
|
|
#endif
|
2010-08-20 21:09:45 +03:00
|
|
|
|
2010-08-21 04:16:58 +03:00
|
|
|
#include "at86rf230.h"
|
2010-11-11 13:26:01 +02:00
|
|
|
#include "atusb/ep0.h"
|
The Great ATSPI Renaming, part 4: rename include/atspi.h to include/atrf.h
- include/atspi.h: renamed to include/atrf.h
- include/misctxrx.h, lib/atrf.c, lib/misctxrx.c, atspi-id/atspi-id.c,
atspi-reset/atspi-reset.c, atspi-rssi/atspi-rssi.c, atspi-rssi/gui.c,
atspi-rssi/gui.h, atspi-trim/atspi-trim.c, atspi-txrx/atspi-txrx.c:
change #include "atspi.h" to #include "atrf.h"
2010-11-11 13:58:47 +02:00
|
|
|
#include "atrf.h"
|
2010-08-20 21:09:45 +03:00
|
|
|
|
|
|
|
|
2010-09-06 02:51:07 +03:00
|
|
|
#ifdef HAVE_USB
|
|
|
|
|
2010-11-11 13:41:25 +02:00
|
|
|
#define FROM_DEV ATUSB_FROM_DEV(0)
|
2010-08-20 21:09:45 +03:00
|
|
|
|
|
|
|
#define BUF_SIZE 256
|
|
|
|
|
|
|
|
|
|
|
|
static int get_id(usb_dev_handle *dev, void *data, int size)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
2010-11-11 13:41:25 +02:00
|
|
|
res = usb_control_msg(dev, FROM_DEV, ATUSB_ID, 0, 0, data, size, 1000);
|
2010-08-20 21:09:45 +03:00
|
|
|
if (res < 0)
|
2010-11-11 13:41:25 +02:00
|
|
|
fprintf(stderr, "ATUSB_ID: %s\n", usb_strerror());
|
2010-08-20 21:09:45 +03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
static int get_protocol(usb_dev_handle *dev,
|
2010-08-20 21:09:45 +03:00
|
|
|
uint8_t *major, uint8_t *minor, uint8_t *target)
|
|
|
|
{
|
|
|
|
uint8_t ids[3];
|
|
|
|
|
|
|
|
if (get_id(dev, ids, 3) < 0)
|
|
|
|
return -1;
|
|
|
|
if (major)
|
|
|
|
*major = ids[0];
|
|
|
|
if (minor)
|
|
|
|
*minor = ids[1];
|
|
|
|
if (target)
|
|
|
|
*target = ids[2];
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
static int get_build(usb_dev_handle *dev, char *buf, size_t size)
|
2010-08-20 21:09:45 +03:00
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
2010-11-11 13:41:25 +02:00
|
|
|
res = usb_control_msg(dev, FROM_DEV, ATUSB_BUILD, 0, 0, buf, size,
|
2010-08-20 21:09:45 +03:00
|
|
|
1000);
|
|
|
|
if (res < 0)
|
2010-11-11 13:41:25 +02:00
|
|
|
fprintf(stderr, "ATUSB_BUILD: %s\n", usb_strerror());
|
2010-08-20 21:09:45 +03:00
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
static void show_usb_info(struct atrf_dsc *dsc)
|
2010-08-20 21:09:45 +03:00
|
|
|
{
|
2010-09-06 02:51:07 +03:00
|
|
|
usb_dev_handle *dev;
|
|
|
|
const struct usb_device *device;
|
2010-08-20 21:09:45 +03:00
|
|
|
uint8_t major, minor, target;
|
2011-02-11 04:43:36 +02:00
|
|
|
const char *mcu;
|
2010-08-20 21:09:45 +03:00
|
|
|
char buf[BUF_SIZE+1]; /* +1 for terminating \0 */
|
|
|
|
int len;
|
|
|
|
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
dev = atrf_usb_handle(dsc);
|
2010-09-06 02:51:07 +03:00
|
|
|
if (!dev)
|
|
|
|
return;
|
|
|
|
device = usb_device(dev);
|
|
|
|
|
2010-08-20 21:09:45 +03:00
|
|
|
printf("%04x:%04x ",
|
|
|
|
device->descriptor.idVendor, device->descriptor.idProduct);
|
|
|
|
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
if (get_protocol(dev, &major, &minor, &target) < 0)
|
2010-08-20 21:09:45 +03:00
|
|
|
exit(1);
|
2011-02-11 04:43:36 +02:00
|
|
|
switch (target) {
|
|
|
|
case HW_TYPE_100813:
|
|
|
|
case HW_TYPE_101216:
|
|
|
|
mcu = "C8051F326";
|
|
|
|
break;
|
|
|
|
case HW_TYPE_110131:
|
|
|
|
mcu = "ATmega32U2";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
mcu = "???";
|
|
|
|
}
|
|
|
|
printf("protocol %u.%u hw %u (%s)\n", major, minor, target, mcu);
|
2010-08-20 21:09:45 +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)
2010-09-06 02:32:58 +03:00
|
|
|
len = get_build(dev, buf, sizeof(buf)-1);
|
2010-08-20 21:09:45 +03:00
|
|
|
if (len < 0)
|
|
|
|
exit(1);
|
|
|
|
buf[len] = 0;
|
|
|
|
printf("%10s%s\n", "", buf);
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
}
|
|
|
|
|
2010-08-21 04:16:58 +03:00
|
|
|
|
2011-07-06 00:53:32 +03:00
|
|
|
static void do_dump_debug(struct atrf_dsc *dsc)
|
|
|
|
{
|
|
|
|
usb_dev_handle *dev;
|
|
|
|
uint8_t buf[1024];
|
|
|
|
int res;
|
|
|
|
struct log {
|
|
|
|
uint16_t n;
|
|
|
|
uint8_t bmRequestType;
|
|
|
|
uint8_t bRequest;
|
|
|
|
uint16_t wValue;
|
|
|
|
uint16_t wIndex;
|
|
|
|
uint16_t wLength;
|
|
|
|
} *p;
|
|
|
|
|
|
|
|
dev = atrf_usb_handle(dsc);
|
|
|
|
if (!dev)
|
|
|
|
return;
|
|
|
|
|
|
|
|
res = usb_control_msg(dev, FROM_DEV, ATUSB_READ_LOG, 0, 0,
|
|
|
|
(void *) buf, sizeof(buf), 1000);
|
|
|
|
if (res < 0) {
|
|
|
|
fprintf(stderr, "ATUSB_READ_LOG: %s\n", usb_strerror());
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
printf("Number\tbmRequestType\tbRequest\twValue\twIndex\twLength\n");
|
|
|
|
for (p = (void *) buf; (uint8_t *) (p+1) <= buf+res; p++) {
|
|
|
|
printf("%u\t", p->n);
|
|
|
|
printf("0x%02x\t\t", p->bmRequestType);
|
|
|
|
printf("0x%02x\t\t", p->bRequest);
|
|
|
|
printf("0x%04x\t", p->wValue);
|
|
|
|
printf("0x%04x\t", p->wIndex);
|
|
|
|
printf("0x%04x\n", p->wLength);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-09-06 02:51:07 +03:00
|
|
|
#else /* HAVE_USB */
|
|
|
|
|
|
|
|
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
static void show_usb_info(struct atrf_dsc *dsc)
|
2010-09-06 02:51:07 +03:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-07-06 00:53:32 +03:00
|
|
|
static void do_dump_debug(struct atrf_dsc *dsc)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-09-06 02:51:07 +03:00
|
|
|
#endif /* !HAVE_USB */
|
|
|
|
|
|
|
|
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
static void show_info(struct atrf_dsc *dsc)
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
{
|
|
|
|
uint8_t part, version, man_id_0, man_id_1;
|
|
|
|
|
2010-09-06 02:51:07 +03:00
|
|
|
show_usb_info(dsc);
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
|
2011-01-07 17:35:51 +02:00
|
|
|
printf("%10s", "");
|
|
|
|
|
|
|
|
switch (atrf_identify(dsc)) {
|
|
|
|
case atrf_unknown_chip:
|
|
|
|
printf("???");
|
|
|
|
break;
|
|
|
|
case artf_at86rf230:
|
|
|
|
printf("AT86RF230");
|
|
|
|
break;
|
|
|
|
case artf_at86rf231:
|
|
|
|
printf("AT86RF231");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
part = atrf_reg_read(dsc, REG_PART_NUM);
|
|
|
|
version = atrf_reg_read(dsc, REG_VERSION_NUM);
|
|
|
|
man_id_0 = atrf_reg_read(dsc, REG_MAN_ID_0);
|
|
|
|
man_id_1 = atrf_reg_read(dsc, REG_MAN_ID_1);
|
2011-01-07 17:35:51 +02:00
|
|
|
printf(", part 0x%02x version %u manufacturer xxxx%02x%02x",
|
2010-08-21 04:16:58 +03:00
|
|
|
part, version, man_id_1, man_id_0);
|
2011-01-07 17:35:51 +02:00
|
|
|
|
|
|
|
printf(" (%s)\n", man_id_1 == 0 && man_id_0 == 0x1f ? "Atmel" : "???");
|
2010-08-20 21:09:45 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void usage(const char *name)
|
|
|
|
{
|
tools: atrf-id option -s to retrieve driver spec, with necessary infrastructure
- include/atrf.h (atrf_driver_spec), lib/atrf.c (atrf_driver_spec):
new function to retrieve the local or remote/final driver spec
- lib/atrf.c (struct atrf_dsc, atrf_open, atrf_close): record the local
driver spec
- lib/driver.h (struct atrf_driver): new driver function "driver_spec"
to retrieve the driver spec
- lib/atnet.c (struct atnet_dsc, atnet_open, atnet_close): maintain a
cache for the driver spec
- lib/atnet.c (atnet_driver_spec, atnet_driver): added support for the
"driver_spec" function
- atrf-proxy/PROTOCOL, atrf-proxy/atrf-proxy.c (cmd_zero): added command
SPEC to retrieve the (final) driver spec
- atrf-id/atrf-id.c (usage, main): added option -s to retrieve the
driver spec. One -s retrieves the local spec, -s -s the remote/final.
2011-04-20 14:58:17 +03:00
|
|
|
fprintf(stderr,
|
|
|
|
"usage: %s [-d driver[:arg]] [-s [-s]]\n\n"
|
|
|
|
" -d driver[:arg] use the specified driver (default: %s)\n"
|
2011-07-06 00:53:32 +03:00
|
|
|
" -D dump atusb debug buffer\n"
|
tools: atrf-id option -s to retrieve driver spec, with necessary infrastructure
- include/atrf.h (atrf_driver_spec), lib/atrf.c (atrf_driver_spec):
new function to retrieve the local or remote/final driver spec
- lib/atrf.c (struct atrf_dsc, atrf_open, atrf_close): record the local
driver spec
- lib/driver.h (struct atrf_driver): new driver function "driver_spec"
to retrieve the driver spec
- lib/atnet.c (struct atnet_dsc, atnet_open, atnet_close): maintain a
cache for the driver spec
- lib/atnet.c (atnet_driver_spec, atnet_driver): added support for the
"driver_spec" function
- atrf-proxy/PROTOCOL, atrf-proxy/atrf-proxy.c (cmd_zero): added command
SPEC to retrieve the (final) driver spec
- atrf-id/atrf-id.c (usage, main): added option -s to retrieve the
driver spec. One -s retrieves the local spec, -s -s the remote/final.
2011-04-20 14:58:17 +03:00
|
|
|
" -s print only the local driver specification\n"
|
|
|
|
" -s -s print only the remote driver specification\n"
|
|
|
|
, name, atrf_default_driver_name());
|
2010-08-20 21:09:45 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
int main(int argc, char *const *argv)
|
2010-08-20 21:09:45 +03:00
|
|
|
{
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
const char *driver = NULL;
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
struct atrf_dsc *dsc;
|
tools: atrf-id option -s to retrieve driver spec, with necessary infrastructure
- include/atrf.h (atrf_driver_spec), lib/atrf.c (atrf_driver_spec):
new function to retrieve the local or remote/final driver spec
- lib/atrf.c (struct atrf_dsc, atrf_open, atrf_close): record the local
driver spec
- lib/driver.h (struct atrf_driver): new driver function "driver_spec"
to retrieve the driver spec
- lib/atnet.c (struct atnet_dsc, atnet_open, atnet_close): maintain a
cache for the driver spec
- lib/atnet.c (atnet_driver_spec, atnet_driver): added support for the
"driver_spec" function
- atrf-proxy/PROTOCOL, atrf-proxy/atrf-proxy.c (cmd_zero): added command
SPEC to retrieve the (final) driver spec
- atrf-id/atrf-id.c (usage, main): added option -s to retrieve the
driver spec. One -s retrieves the local spec, -s -s the remote/final.
2011-04-20 14:58:17 +03:00
|
|
|
int spec_only = 0;
|
2011-07-06 00:53:32 +03:00
|
|
|
int dump_debug = 0;
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
int c;
|
|
|
|
|
2011-07-06 00:53:32 +03:00
|
|
|
while ((c = getopt(argc, argv, "d:Ds")) != EOF)
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
switch (c) {
|
|
|
|
case 'd':
|
|
|
|
driver = optarg;
|
|
|
|
break;
|
2011-07-06 00:53:32 +03:00
|
|
|
case 'D':
|
|
|
|
dump_debug = 1;
|
|
|
|
break;
|
tools: atrf-id option -s to retrieve driver spec, with necessary infrastructure
- include/atrf.h (atrf_driver_spec), lib/atrf.c (atrf_driver_spec):
new function to retrieve the local or remote/final driver spec
- lib/atrf.c (struct atrf_dsc, atrf_open, atrf_close): record the local
driver spec
- lib/driver.h (struct atrf_driver): new driver function "driver_spec"
to retrieve the driver spec
- lib/atnet.c (struct atnet_dsc, atnet_open, atnet_close): maintain a
cache for the driver spec
- lib/atnet.c (atnet_driver_spec, atnet_driver): added support for the
"driver_spec" function
- atrf-proxy/PROTOCOL, atrf-proxy/atrf-proxy.c (cmd_zero): added command
SPEC to retrieve the (final) driver spec
- atrf-id/atrf-id.c (usage, main): added option -s to retrieve the
driver spec. One -s retrieves the local spec, -s -s the remote/final.
2011-04-20 14:58:17 +03:00
|
|
|
case 's':
|
|
|
|
spec_only++;
|
|
|
|
break;
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
default:
|
|
|
|
usage(*argv);
|
|
|
|
}
|
|
|
|
if (argc != optind)
|
2010-08-20 21:09:45 +03:00
|
|
|
usage(*argv);
|
tools/: added option -d driver[:arg] to all tools
- atrf-id/atrf-id.c (main), atrf-reset/atrf-reset.c (main),
atrf-trim/atrf-trim.c (main): changed command-line parsing to use
"getopt"
- atrf-id/atrf-id.c (usage, main), atrf-reset/atrf-reset.c (usage, main),
atrf-rssi/atrf-rssi.c (usage, main), atrf-trim/atrf-trim.c (usage,
main), atrf-txrx/atrf-txrx.c (init_txrx, usage, main),
atrf-xtal/atrf-xtal.c (usage, main): added option -d to select a driver
2011-04-10 13:13:53 +03:00
|
|
|
|
|
|
|
dsc = atrf_open(driver);
|
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)
2010-09-06 02:32:58 +03:00
|
|
|
if (!dsc)
|
2010-08-20 21:09:45 +03:00
|
|
|
return 1;
|
|
|
|
|
tools: atrf-id option -s to retrieve driver spec, with necessary infrastructure
- include/atrf.h (atrf_driver_spec), lib/atrf.c (atrf_driver_spec):
new function to retrieve the local or remote/final driver spec
- lib/atrf.c (struct atrf_dsc, atrf_open, atrf_close): record the local
driver spec
- lib/driver.h (struct atrf_driver): new driver function "driver_spec"
to retrieve the driver spec
- lib/atnet.c (struct atnet_dsc, atnet_open, atnet_close): maintain a
cache for the driver spec
- lib/atnet.c (atnet_driver_spec, atnet_driver): added support for the
"driver_spec" function
- atrf-proxy/PROTOCOL, atrf-proxy/atrf-proxy.c (cmd_zero): added command
SPEC to retrieve the (final) driver spec
- atrf-id/atrf-id.c (usage, main): added option -s to retrieve the
driver spec. One -s retrieves the local spec, -s -s the remote/final.
2011-04-20 14:58:17 +03:00
|
|
|
if (spec_only) {
|
|
|
|
const char *spec = atrf_driver_spec(dsc, spec_only > 1);
|
|
|
|
|
|
|
|
if (spec)
|
|
|
|
printf("%s\n", spec);
|
|
|
|
else {
|
|
|
|
fprintf(stderr, "can't obtain specification\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
show_info(dsc);
|
|
|
|
}
|
2011-07-06 00:53:32 +03:00
|
|
|
if (dump_debug)
|
|
|
|
do_dump_debug(dsc);
|
2010-08-20 21:09:45 +03:00
|
|
|
|
The Great ATSPI Renaming, part 6: change atrf API from atspi_* to atrf_*
- include/atrf.h, lib/atrf.c (struct atspi_dsc): renamed to "struct
atrf_dsc"
- include/atrf.h, lib/atrf.c (atspi_*): renamed all functions to atrf_*
- include/misctxrx.h, lib/misctxrx.c (wait_for_interrupt): updated for API
name change
- atspi-id/atspi-id.c (show_usb_info, show_info, main),
atspi-reset/atspi-reset.c (main), atspi-rssi/atspi-rssi.c (sweep, main),
atspi-rssi/gui.h (gui), atspi-rssi/gui.c (sweep, gui),
atspi-trim/atspi-trim.c (main), atspi-txrx/atspi-txrx.c (init_txrx,
set_channel, set_power, receive, transmit, test_mode, main):
updated for API name change
2010-11-11 15:10:13 +02:00
|
|
|
atrf_close(dsc);
|
2010-09-06 03:18:56 +03:00
|
|
|
|
2010-08-20 21:09:45 +03:00
|
|
|
return 0;
|
|
|
|
}
|