1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-12-23 05:03:25 +02:00

tools/lib/: split non-SPI code from atusb.c in preparation for SPI-based driver

- atusb.c (atusb_error, atusb_clear_error, atusb_open, atusb_close,
  atusb_reset, atusb_reset_rf, atusb_test_mode, atusb_slp_tr,
  atusb_interrupt, atusb_set_clkm, atusb_dev_handle): moved to
  atusb-common.c
- atusb-common.c (atusb_set_clkm): pass atusb_reg_write via
  atusb_driver.reg_write instead
- atusb.c (FROM_DEV, TO_DEV, struct atusb_dsc): moved to atusb-common.h
- Makefile (OBJS): added atusb-common.o
This commit is contained in:
Werner Almesberger 2011-06-19 14:06:00 -03:00
parent 9746205fd9
commit 13f031be25
4 changed files with 280 additions and 225 deletions

View File

@ -15,7 +15,7 @@ LIB = libatrf.a
include ../Makefile.common
OBJS_host = atusb.o usbopen.o
OBJS_host = atusb.o atusb-common.o usbopen.o
OBJS_ben_jlime = atben.o
OBJS_ben_openwrt = atben.o

239
tools/lib/atusb-common.c Normal file
View File

@ -0,0 +1,239 @@
/*
* lib/atusb-common.c - ATUSB access functions shared by all ATUSB drivers
*
* Written 2010-2011 by Werner Almesberger
* Copyright 2010-2011 Werner Almesberger
*
* 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 <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#include <usb.h>
#include "atusb/ep0.h"
#include "atusb/usb-ids.h"
#include "usbopen.h"
#include "driver.h"
#include "atusb-common.h"
/* ----- error handling ---------------------------------------------------- */
int atusb_error(void *handle)
{
struct atusb_dsc *dsc = handle;
return dsc->error;
}
int atusb_clear_error(void *handle)
{
struct atusb_dsc *dsc = handle;
int ret;
ret = dsc->error;
dsc->error = 0;
return ret;
}
/* ----- open/close -------------------------------------------------------- */
void *atusb_open(const char *arg)
{
usb_dev_handle *dev;
struct atusb_dsc *dsc;
usb_unrestrict();
if (arg)
restrict_usb_path(arg);
dev = open_usb(USB_VENDOR, USB_PRODUCT);
if (!dev) {
fprintf(stderr, ":-(\n");
return NULL;
}
dsc = malloc(sizeof(*dsc));
if (!dsc) {
perror("malloc");
exit(1);
}
dsc->dev = dev;
dsc->error = 0;
return dsc;
}
void atusb_close(void *handle)
{
/* to do */
}
/* ----- device mode ------------------------------------------------------- */
void atusb_reset(void *handle)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
res =
usb_control_msg(dsc->dev, TO_DEV, ATUSB_RESET, 0, 0, NULL, 0, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_RESET: %d\n", res);
dsc->error = 1;
}
}
void atusb_reset_rf(void *handle)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_RF_RESET, 0, 0, NULL,
0, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_RF_RESET: %d\n", res);
dsc->error = 1;
}
}
void atusb_test_mode(void *handle)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
res =
usb_control_msg(dsc->dev, TO_DEV, ATUSB_TEST, 0, 0, NULL, 0, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_TEST: %d\n", res);
dsc->error = 1;
}
}
/* ----- SLP_TR ------------------------------------------------------------ */
void atusb_slp_tr(void *handle, int on, int pulse)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
if (!on || !pulse) {
fprintf(stderr,
"SLP_TR mode on=%d pulse=%d not supported\n", on, pulse);
return;
}
res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_SLP_TR, 0, 0, NULL, 0,
1000);
if (res < 0) {
fprintf(stderr, "ATUSB_SLP_TR: %d\n", res);
dsc->error = 1;
}
}
/* ----- RF interrupt ------------------------------------------------------ */
int atusb_interrupt(void *handle)
{
struct atusb_dsc *dsc = handle;
uint8_t buf;
int res;
if (dsc->error)
return -1;
res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_POLL_INT, 0, 0,
(void *) &buf, 1, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_POLL_INT: %d\n", res);
dsc->error = 1;
return -1;
}
return buf;
}
/* ----- CLKM handling ----------------------------------------------------- */
/*
* ATmega32U2-based boards don't allow disabling CLKM, so we keep it at 8 MHz.
* We could accommodate a choice between 8 MHz and 16 MHz, but that's for
* later.
*/
int atusb_set_clkm(void *handle, int mhz)
{
struct atusb_dsc *dsc = handle;
uint8_t ids[3];
int res;
if (dsc->error)
return 0;
res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_ID, 0, 0,
(void *) ids, 3, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_ID: %s\n", usb_strerror());
dsc->error = 1;
return 0;
}
switch (ids[2]) {
case HW_TYPE_100813:
case HW_TYPE_101216:
break;
case HW_TYPE_110131:
if (mhz == 0 || mhz == 8)
return 1;
fprintf(stderr, "this board only supports CLKM = 8 MHz\n");
return 0;
default:
fprintf(stderr,
"atusb_set_clkm: unknown hardware type 0x%02x\n", ids[2]);
return 0;
}
return atrf_set_clkm_generic(atusb_driver.reg_write, dsc, mhz);
}
/* ----- Driver-specific hacks --------------------------------------------- */
void *atusb_dev_handle(void *handle)
{
struct atusb_dsc *dsc = handle;
return dsc->dev;
}

39
tools/lib/atusb-common.h Normal file
View File

@ -0,0 +1,39 @@
/*
* lib/atusb-common.h - ATUSB access functions shared by all ATUSB drivers
*
* Written 2010-2011 by Werner Almesberger
* Copyright 2010-2011 Werner Almesberger
*
* 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.
*/
#ifndef ATUSB_COMMON_H
#define ATUSB_COMMON_H
#define FROM_DEV ATUSB_FROM_DEV(0)
#define TO_DEV ATUSB_TO_DEV(0)
struct atusb_dsc {
usb_dev_handle *dev;
int error;
};
int atusb_error(void *handle);
int atusb_clear_error(void *handle);
void *atusb_open(const char *arg);
void atusb_close(void *handle);
void atusb_reset(void *handle);
void atusb_reset_rf(void *handle);
void atusb_test_mode(void *handle);
void atusb_slp_tr(void *handle, int on, int pulse);
int atusb_interrupt(void *handle);
int atusb_set_clkm(void *handle, int mhz);
#endif /* !ATUSB_COMMON_H */

View File

@ -21,127 +21,7 @@
#include "usbopen.h"
#include "driver.h"
#define FROM_DEV ATUSB_FROM_DEV(0)
#define TO_DEV ATUSB_TO_DEV(0)
struct atusb_dsc {
usb_dev_handle *dev;
int error;
};
/* ----- error handling ---------------------------------------------------- */
static int atusb_error(void *handle)
{
struct atusb_dsc *dsc = handle;
return dsc->error;
}
static int atusb_clear_error(void *handle)
{
struct atusb_dsc *dsc = handle;
int ret;
ret = dsc->error;
dsc->error = 0;
return ret;
}
/* ----- open/close -------------------------------------------------------- */
static void *atusb_open(const char *arg)
{
usb_dev_handle *dev;
struct atusb_dsc *dsc;
usb_unrestrict();
if (arg)
restrict_usb_path(arg);
dev = open_usb(USB_VENDOR, USB_PRODUCT);
if (!dev) {
fprintf(stderr, ":-(\n");
return NULL;
}
dsc = malloc(sizeof(*dsc));
if (!dsc) {
perror("malloc");
exit(1);
}
dsc->dev = dev;
dsc->error = 0;
return dsc;
}
static void atusb_close(void *handle)
{
/* to do */
}
/* ----- device mode ------------------------------------------------------- */
static void atusb_reset(void *handle)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
res =
usb_control_msg(dsc->dev, TO_DEV, ATUSB_RESET, 0, 0, NULL, 0, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_RESET: %d\n", res);
dsc->error = 1;
}
}
static void atusb_reset_rf(void *handle)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_RF_RESET, 0, 0, NULL,
0, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_RF_RESET: %d\n", res);
dsc->error = 1;
}
}
static void atusb_test_mode(void *handle)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
res =
usb_control_msg(dsc->dev, TO_DEV, ATUSB_TEST, 0, 0, NULL, 0, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_TEST: %d\n", res);
dsc->error = 1;
}
}
#include "atusb-common.h"
/* ----- register access --------------------------------------------------- */
@ -261,109 +141,6 @@ static uint8_t atusb_sram_read(void *handle, uint8_t addr)
}
/* ----- SLP_TR ------------------------------------------------------------ */
static void atusb_slp_tr(void *handle, int on, int pulse)
{
struct atusb_dsc *dsc = handle;
int res;
if (dsc->error)
return;
if (!on || !pulse) {
fprintf(stderr,
"SLP_TR mode on=%d pulse=%d not supported\n", on, pulse);
return;
}
res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_SLP_TR, 0, 0, NULL, 0,
1000);
if (res < 0) {
fprintf(stderr, "ATUSB_SLP_TR: %d\n", res);
dsc->error = 1;
}
}
/* ----- RF interrupt ------------------------------------------------------ */
static int atusb_interrupt(void *handle)
{
struct atusb_dsc *dsc = handle;
uint8_t buf;
int res;
if (dsc->error)
return -1;
res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_POLL_INT, 0, 0,
(void *) &buf, 1, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_POLL_INT: %d\n", res);
dsc->error = 1;
return -1;
}
return buf;
}
/* ----- CLKM handling ----------------------------------------------------- */
/*
* ATmega32U2-based boards don't allow disabling CLKM, so we keep it at 8 MHz.
* We could accommodate a choice between 8 MHz and 16 MHz, but that's for
* later.
*/
static int atusb_set_clkm(void *handle, int mhz)
{
struct atusb_dsc *dsc = handle;
uint8_t ids[3];
int res;
if (dsc->error)
return 0;
res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_ID, 0, 0,
(void *) ids, 3, 1000);
if (res < 0) {
fprintf(stderr, "ATUSB_ID: %s\n", usb_strerror());
dsc->error = 1;
return 0;
}
switch (ids[2]) {
case HW_TYPE_100813:
case HW_TYPE_101216:
break;
case HW_TYPE_110131:
if (mhz == 0 || mhz == 8)
return 1;
fprintf(stderr, "this board only supports CLKM = 8 MHz\n");
return 0;
default:
fprintf(stderr,
"atusb_set_clkm: unknown hardware type 0x%02x\n", ids[2]);
return 0;
}
return atrf_set_clkm_generic(atusb_reg_write, dsc, mhz);
}
/* ----- Driver-specific hacks --------------------------------------------- */
void *atusb_dev_handle(void *handle)
{
struct atusb_dsc *dsc = handle;
return dsc->dev;
}
/* ----- driver interface -------------------------------------------------- */