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

tools/lib/atusb.c: eliminated global variable to allow for multiple sessions

Browse Source 
- atusb.c: introduced descriptor structure, replacing direct USB device
  handle
- atusb.c (error): moved global variable into descriptor
- driver.h (atusb_dev_handle), atusb.c (atusb_dev_handle), atrf.c
  (atrf_usb_handle): call driver to perform the no longer trivial
  translation
This commit is contained in:
Werner Almesberger 2011-04-12 09:22:40 -03:00
parent 02b80879bf
commit 95c8fce729
3 changed files with 87 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lib/atrf.c
View File

@ -44,7 +44,7 @@ void *atrf_usb_handle(struct atrf_dsc *dsc)
{ {
#ifdef HAVE_USB #ifdef HAVE_USB
if (dsc->driver == &atusb_driver) if (dsc->driver == &atusb_driver)
return dsc->handle; return atusb_dev_handle(dsc->handle);
#endif #endif
return NULL; return NULL;
} }

146
tools/lib/atusb.c
View File

@ -25,24 +25,29 @@
#define TO_DEV ATUSB_TO_DEV(0) #define TO_DEV ATUSB_TO_DEV(0)
struct atusb_dsc {
usb_dev_handle *dev;
int error;
};
/* ----- error handling ---------------------------------------------------- */ /* ----- error handling ---------------------------------------------------- */
static int error; static int atusb_error(void *handle)
static int atusb_error(void *dsc)
{ {
return error; struct atusb_dsc *dsc = handle;
return dsc->error;
} }
static int atusb_clear_error(void *dsc) static int atusb_clear_error(void *handle)
{ {
struct atusb_dsc *dsc = handle;
int ret; int ret;
ret = error; ret = dsc->error;
error = 0; dsc->error = 0;
return ret; return ret;
} }
@ -53,22 +58,31 @@ static int atusb_clear_error(void *dsc)
static void *atusb_open(const char *arg) static void *atusb_open(const char *arg)
{ {
usb_dev_handle *dev; usb_dev_handle *dev;
struct atusb_dsc *dsc;
usb_unrestrict(); usb_unrestrict();
if (arg) if (arg)
restrict_usb_path(arg); restrict_usb_path(arg);
dev = open_usb(USB_VENDOR, USB_PRODUCT); dev = open_usb(USB_VENDOR, USB_PRODUCT);
if (dev) { if (!dev) {
error = 0;
} else {
fprintf(stderr, ":-(\n"); fprintf(stderr, ":-(\n");
error = 1; return NULL;
} }
return dev;
dsc = malloc(sizeof(*dsc));
if (!dsc) {
perror("malloc");
exit(1);
}
dsc->dev = dev;
dsc->error = 0;
return dsc;
} }
static void atusb_close(void *dsc) static void atusb_close(void *handle)
{ {
/* to do */ /* to do */
} }
@ -77,53 +91,53 @@ static void atusb_close(void *dsc)
/* ----- device mode ------------------------------------------------------- */ /* ----- device mode ------------------------------------------------------- */
static void atusb_reset(void *dsc) static void atusb_reset(void *handle)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
int res; int res;
if (error) if (dsc->error)
return; return;
res = res =
usb_control_msg(dev, TO_DEV, ATUSB_RESET, 0, 0, NULL, 0, 1000); usb_control_msg(dsc->dev, TO_DEV, ATUSB_RESET, 0, 0, NULL, 0, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_RESET: %d\n", res); fprintf(stderr, "ATUSB_RESET: %d\n", res);
error = 1; dsc->error = 1;
} }
} }
static void atusb_reset_rf(void *dsc) static void atusb_reset_rf(void *handle)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
int res; int res;
if (error) if (dsc->error)
return; return;
res = res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_RF_RESET, 0, 0, NULL,
usb_control_msg(dev, TO_DEV, ATUSB_RF_RESET, 0, 0, NULL, 0, 1000); 0, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_RF_RESET: %d\n", res); fprintf(stderr, "ATUSB_RF_RESET: %d\n", res);
error = 1; dsc->error = 1;
} }
} }
static void atusb_test_mode(void *dsc) static void atusb_test_mode(void *handle)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
int res; int res;
if (error) if (dsc->error)
return; return;
res = res =
usb_control_msg(dev, TO_DEV, ATUSB_TEST, 0, 0, NULL, 0, 1000); usb_control_msg(dsc->dev, TO_DEV, ATUSB_TEST, 0, 0, NULL, 0, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_TEST: %d\n", res); fprintf(stderr, "ATUSB_TEST: %d\n", res);
error = 1; dsc->error = 1;
} }
} }
@ -131,37 +145,37 @@ static void atusb_test_mode(void *dsc)
/* ----- register access --------------------------------------------------- */ /* ----- register access --------------------------------------------------- */
static void atusb_reg_write(void *dsc, uint8_t reg, uint8_t value) static void atusb_reg_write(void *handle, uint8_t reg, uint8_t value)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
int res; int res;
if (error) if (dsc->error)
return; return;
res = usb_control_msg(dev, TO_DEV, ATUSB_REG_WRITE, value, reg, res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_REG_WRITE, value, reg,
NULL, 0, 1000); NULL, 0, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_REG_WRITE: %d\n", res); fprintf(stderr, "ATUSB_REG_WRITE: %d\n", res);
error = 1; dsc->error = 1;
} }
} }
static uint8_t atusb_reg_read(void *dsc, uint8_t reg) static uint8_t atusb_reg_read(void *handle, uint8_t reg)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
uint8_t value = 0; uint8_t value = 0;
int res; int res;
if (error) if (dsc->error)
return 0; return 0;
res = usb_control_msg(dev, FROM_DEV, ATUSB_REG_READ, 0, reg, res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_REG_READ, 0, reg,
(void *) &value, 1, 1000); (void *) &value, 1, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_REG_READ: %d\n", res); fprintf(stderr, "ATUSB_REG_READ: %d\n", res);
error = 1; dsc->error = 1;
} }
return value; return value;
} }
@ -170,37 +184,36 @@ static uint8_t atusb_reg_read(void *dsc, uint8_t reg)
/* ----- frame buffer access ----------------------------------------------- */ /* ----- frame buffer access ----------------------------------------------- */
static void atusb_buf_write(void *dsc, const void *buf, int size) static void atusb_buf_write(void *handle, const void *buf, int size)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
int res; int res;
if (error) if (dsc->error)
return; return;
res = usb_control_msg(dev, TO_DEV, ATUSB_BUF_WRITE, 0, 0, res = usb_control_msg(dsc->dev, TO_DEV, ATUSB_BUF_WRITE, 0, 0,
(void *) buf, size, 1000); (void *) buf, size, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_BUF_WRITE: %d\n", res); fprintf(stderr, "ATUSB_BUF_WRITE: %d\n", res);
error = 1; dsc->error = 1;
} }
} }
static int atusb_buf_read(void *dsc, void *buf, int size) static int atusb_buf_read(void *handle, void *buf, int size)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
int res; int res;
if (error) if (dsc->error)
return -1; return -1;
res = usb_control_msg(dev, FROM_DEV, ATUSB_BUF_READ, 0, 0, res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_BUF_READ, 0, 0,
buf, size, 1000); buf, size, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_BUF_READ: %d\n", res); fprintf(stderr, "ATUSB_BUF_READ: %d\n", res);
error = 1; dsc->error = 1;
} }
return res; return res;
@ -210,20 +223,20 @@ static int atusb_buf_read(void *dsc, void *buf, int size)
/* ----- RF interrupt ------------------------------------------------------ */ /* ----- RF interrupt ------------------------------------------------------ */
static int atusb_interrupt(void *dsc) static int atusb_interrupt(void *handle)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
uint8_t buf; uint8_t buf;
int res; int res;
if (error) if (dsc->error)
return -1; return -1;
res = usb_control_msg(dev, FROM_DEV, ATUSB_POLL_INT, 0, 0, res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_POLL_INT, 0, 0,
(void *) &buf, 1, 1000); (void *) &buf, 1, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_POLL_INT: %d\n", res); fprintf(stderr, "ATUSB_POLL_INT: %d\n", res);
error = 1; dsc->error = 1;
return -1; return -1;
} }
@ -240,19 +253,19 @@ static int atusb_interrupt(void *dsc)
* later. * later.
*/ */
static int atusb_set_clkm(void *dsc, int mhz) static int atusb_set_clkm(void *handle, int mhz)
{ {
usb_dev_handle *dev = dsc; struct atusb_dsc *dsc = handle;
uint8_t ids[3]; uint8_t ids[3];
int res; int res;
if (error) if (dsc->error)
return 0; return 0;
res = usb_control_msg(dev, FROM_DEV, ATUSB_ID, 0, 0, res = usb_control_msg(dsc->dev, FROM_DEV, ATUSB_ID, 0, 0,
(void *) ids, 3, 1000); (void *) ids, 3, 1000);
if (res < 0) { if (res < 0) {
fprintf(stderr, "ATUSB_ID: %s\n", usb_strerror()); fprintf(stderr, "ATUSB_ID: %s\n", usb_strerror());
error = 1; dsc->error = 1;
return 0; return 0;
} }
switch (ids[2]) { switch (ids[2]) {
@ -273,6 +286,17 @@ static int atusb_set_clkm(void *dsc, int mhz)
} }
/* ----- Driver-specific hacks --------------------------------------------- */
void *atusb_dev_handle(void *handle)
{
struct atusb_dsc *dsc = handle;
return dsc->dev;
}
/* ----- driver interface -------------------------------------------------- */ /* ----- driver interface -------------------------------------------------- */

1
tools/lib/driver.h
View File

@ -46,5 +46,6 @@ int atrf_set_clkm_generic(
void *handle, int mhz); void *handle, int mhz);
void *atben_regs(void *dsc); /* hack for atrf-xtal */ void *atben_regs(void *dsc); /* hack for atrf-xtal */
void *atusb_dev_handle(void *dsc); /* hack for atrf-id */
#endif /* !DRIVER_H */ #endif /* !DRIVER_H */