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

libatrf: simplify use of atrf_interrupt_wait now this it is mandatory

Browse Source 
- lib/atrf.c (atrf_interrupt_wait): interrupt_wait is no longer
  optional
- atrf-proxy/atrf-proxy.c (cmd_more): we no longer need to handle
  atrf_interrupt_wait being unsupported
- lib/atusb-common.c (atusb_interrupt_wait): clarify what we don't
  want to return -1 on error
This commit is contained in:
Werner Almesberger 2011-06-20 21:14:14 -03:00
parent d0fb1a8992
commit 10b6d88af9
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/atrf-proxy/atrf-proxy.c
View File

@ -176,8 +176,6 @@ static int cmd_more(struct atrf_dsc *dsc, struct netio *netio, const char *cmd)
res = atrf_interrupt_wait(dsc, n); res = atrf_interrupt_wait(dsc, n);
if (atrf_error(dsc)) if (atrf_error(dsc))
return netio_printf(netio, "-I/O error\n"); return netio_printf(netio, "-I/O error\n");
if (res < 0)
return netio_printf(netio, "-not supported\n");
return netio_printf(netio, "+0x%02x\n", res); return netio_printf(netio, "+0x%02x\n", res);
} }
if (!strcasecmp(cmd, "getram")) { if (!strcasecmp(cmd, "getram")) {

3
tools/lib/atrf.c
View File

@ -320,6 +320,5 @@ uint8_t atrf_sram_read(struct atrf_dsc *dsc, uint8_t addr)
int atrf_interrupt_wait(struct atrf_dsc *dsc, int timeout_ms) int atrf_interrupt_wait(struct atrf_dsc *dsc, int timeout_ms)
{ {
return dsc->driver->interrupt_wait ? return dsc->driver->interrupt_wait(dsc->handle, timeout_ms);
dsc->driver->interrupt_wait(dsc->handle, timeout_ms) : -1;
} }

3
tools/lib/atusb-common.c
View File

@ -221,8 +221,7 @@ int atusb_interrupt_wait(void *handle, int timeout_ms)
if (res < 0) { if (res < 0) {
fprintf(stderr, "usb_bulk_read: %d\n", res); fprintf(stderr, "usb_bulk_read: %d\n", res);
dsc->error = 1; dsc->error = 1;
return 0; return 0; /* handle this via atrf_error */
/* < 0 is already taken by atrf_interrupt_wait */
} }
timeout_ms = 1; timeout_ms = 1;
for (i = 0; i != res; i++) for (i = 0; i != res; i++)