BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lascar-el-usb: Support SR_CONF_CONN

This commit is contained in:
Bert Vermeulen 2013-04-18 22:30:10 +02:00
parent e2033d4917
commit 0f1506497b
3 changed files with 51 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hardware/lascar-el-usb/api.c
View File

@ -57,7 +57,7 @@ static int clear_instances(void)
continue; continue;
hw_dev_close(sdi); hw_dev_close(sdi);
sr_usb_dev_inst_free(devc->usb); sr_usb_dev_inst_free(sdi->conn);
sr_dev_inst_free(sdi); sr_dev_inst_free(sdi);
} }
@ -75,7 +75,6 @@ static int hw_init(struct sr_context *sr_ctx)
static GSList *hw_scan(GSList *options) static GSList *hw_scan(GSList *options)
{ {
struct drv_context *drvc; struct drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct sr_usb_dev_inst *usb; struct sr_usb_dev_inst *usb;
struct sr_config *src; struct sr_config *src;
@ -112,8 +111,8 @@ static GSList *hw_scan(GSList *options)
g_free(usb); g_free(usb);
continue; continue;
} }
devc = sdi->priv; sdi->inst_type = SR_INST_USB;
devc->usb = usb; sdi->conn = usb;
drvc->instances = g_slist_append(drvc->instances, sdi); drvc->instances = g_slist_append(drvc->instances, sdi);
devices = g_slist_append(devices, sdi); devices = g_slist_append(devices, sdi);
} }
@ -132,7 +131,7 @@ static GSList *hw_dev_list(void)
static int hw_dev_open(struct sr_dev_inst *sdi) static int hw_dev_open(struct sr_dev_inst *sdi)
{ {
struct drv_context *drvc; struct drv_context *drvc;
struct dev_context *devc; struct sr_usb_dev_inst *usb;
int ret; int ret;
if (!(drvc = di->priv)) { if (!(drvc = di->priv)) {
@ -140,11 +139,12 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
return SR_ERR; return SR_ERR;
} }
devc = sdi->priv; usb = sdi->conn;
if (sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb) != SR_OK)
if (sr_usb_open(drvc->sr_ctx->libusb_ctx, usb) != SR_OK)
return SR_ERR; return SR_ERR;
if ((ret = libusb_claim_interface(devc->usb->devhdl, LASCAR_INTERFACE))) { if ((ret = libusb_claim_interface(usb->devhdl, LASCAR_INTERFACE))) {
sr_err("Failed to claim interface: %s.", libusb_error_name(ret)); sr_err("Failed to claim interface: %s.", libusb_error_name(ret));
return SR_ERR; return SR_ERR;
} }
@ -155,24 +155,24 @@ static int hw_dev_open(struct sr_dev_inst *sdi)
static int hw_dev_close(struct sr_dev_inst *sdi) static int hw_dev_close(struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct sr_usb_dev_inst *usb;
if (!di->priv) { if (!di->priv) {
sr_err("Driver was not initialized."); sr_err("Driver was not initialized.");
return SR_ERR; return SR_ERR;
} }
devc = sdi->priv; usb = sdi->conn;
if (!devc->usb->devhdl)
if (!usb->devhdl)
/* Nothing to do. */ /* Nothing to do. */
return SR_OK; return SR_OK;
libusb_release_interface(devc->usb->devhdl, LASCAR_INTERFACE); libusb_release_interface(usb->devhdl, LASCAR_INTERFACE);
libusb_close(devc->usb->devhdl); libusb_close(usb->devhdl);
devc->usb->devhdl = NULL; usb->devhdl = NULL;
sdi->status = SR_ST_INACTIVE; sdi->status = SR_ST_INACTIVE;
return SR_OK; return SR_OK;
} }
@ -194,10 +194,19 @@ static int hw_cleanup(void)
static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_usb_dev_inst *usb;
int ret; int ret;
char str[128];
devc = sdi->priv; devc = sdi->priv;
switch (id) { switch (id) {
case SR_CONF_CONN:
if (!sdi || !sdi->conn)
return SR_ERR_ARG;
usb = sdi->conn;
snprintf(str, 128, "%d.%d", usb->bus, usb->address);
*data = g_variant_new_string(str);
break;
case SR_CONF_DATALOG: case SR_CONF_DATALOG:
if (!sdi) if (!sdi)
return SR_ERR_ARG; return SR_ERR_ARG;
@ -306,10 +315,13 @@ static float binary32_le_to_float(unsigned char *buf)
static int lascar_proc_config(const struct sr_dev_inst *sdi) static int lascar_proc_config(const struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_usb_dev_inst *usb;
int dummy, ret; int dummy, ret;
devc = sdi->priv; devc = sdi->priv;
if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK) usb = sdi->conn;
if (lascar_get_config(usb->devhdl, devc->config, &dummy) != SR_OK)
return SR_ERR; return SR_ERR;
ret = SR_OK; ret = SR_OK;
@ -349,6 +361,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
struct sr_config *src; struct sr_config *src;
struct dev_context *devc; struct dev_context *devc;
struct drv_context *drvc; struct drv_context *drvc;
struct sr_usb_dev_inst *usb;
struct libusb_transfer *xfer_in, *xfer_out; struct libusb_transfer *xfer_in, *xfer_out;
const struct libusb_pollfd **pfd; const struct libusb_pollfd **pfd;
struct timeval tv; struct timeval tv;
@ -363,6 +376,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
drvc = di->priv; drvc = di->priv;
devc = sdi->priv; devc = sdi->priv;
usb = sdi->conn;
devc->cb_data = cb_data; devc->cb_data = cb_data;
if (lascar_proc_config(sdi) != SR_OK) if (lascar_proc_config(sdi) != SR_OK)
@ -392,20 +406,20 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
!(xfer_out = libusb_alloc_transfer(0))) !(xfer_out = libusb_alloc_transfer(0)))
return SR_ERR; return SR_ERR;
libusb_control_transfer(devc->usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR, libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR,
0x00, 0xffff, 0x00, NULL, 0, 50); 0x00, 0xffff, 0x00, NULL, 0, 50);
libusb_control_transfer(devc->usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR, libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR,
0x02, 0x0002, 0x00, NULL, 0, 50); 0x02, 0x0002, 0x00, NULL, 0, 50);
libusb_control_transfer(devc->usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR, libusb_control_transfer(usb->devhdl, LIBUSB_REQUEST_TYPE_VENDOR,
0x02, 0x0001, 0x00, NULL, 0, 50); 0x02, 0x0001, 0x00, NULL, 0, 50);
/* Flush input. The F321 requires this. */ /* Flush input. The F321 requires this. */
while (libusb_bulk_transfer(devc->usb->devhdl, LASCAR_EP_IN, resp, while (libusb_bulk_transfer(usb->devhdl, LASCAR_EP_IN, resp,
256, &ret, 5) == 0 && ret > 0) 256, &ret, 5) == 0 && ret > 0)
; ;
libusb_fill_bulk_transfer(xfer_in, devc->usb->devhdl, LASCAR_EP_IN, libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
resp, sizeof(resp), mark_xfer, 0, 10000); resp, sizeof(resp), mark_xfer, 0, 10000);
if (libusb_submit_transfer(xfer_in) != 0) { if (libusb_submit_transfer(xfer_in) != 0) {
libusb_free_transfer(xfer_in); libusb_free_transfer(xfer_in);
@ -416,7 +430,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
cmd[0] = 0x03; cmd[0] = 0x03;
cmd[1] = 0xff; cmd[1] = 0xff;
cmd[2] = 0xff; cmd[2] = 0xff;
libusb_fill_bulk_transfer(xfer_out, devc->usb->devhdl, LASCAR_EP_OUT, libusb_fill_bulk_transfer(xfer_out, usb->devhdl, LASCAR_EP_OUT,
cmd, 3, mark_xfer, 0, 100); cmd, 3, mark_xfer, 0, 100);
if (libusb_submit_transfer(xfer_out) != 0) { if (libusb_submit_transfer(xfer_out) != 0) {
libusb_free_transfer(xfer_in); libusb_free_transfer(xfer_in);
@ -457,7 +471,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
devc->usbfd[i] = -1; devc->usbfd[i] = -1;
buf = g_try_malloc(4096); buf = g_try_malloc(4096);
libusb_fill_bulk_transfer(xfer_in, devc->usb->devhdl, LASCAR_EP_IN, libusb_fill_bulk_transfer(xfer_in, usb->devhdl, LASCAR_EP_IN,
buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100); buf, 4096, lascar_el_usb_receive_transfer, cb_data, 100);
if ((ret = libusb_submit_transfer(xfer_in) != 0)) { if ((ret = libusb_submit_transfer(xfer_in) != 0)) {
sr_err("Unable to submit transfer: %s.", libusb_error_name(ret)); sr_err("Unable to submit transfer: %s.", libusb_error_name(ret));

19
hardware/lascar-el-usb/protocol.c
View File

@ -595,10 +595,13 @@ static int set_flags(unsigned char *configblock, int flags)
SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi) SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_usb_dev_inst *usb;
int dummy, flags, ret; int dummy, flags, ret;
devc = sdi->priv; devc = sdi->priv;
if (lascar_get_config(devc->usb->devhdl, devc->config, &dummy) != SR_OK) usb = sdi->conn;
if (lascar_get_config(usb->devhdl, devc->config, &dummy) != SR_OK)
return -1; return -1;
flags = get_flags(devc->config); flags = get_flags(devc->config);
@ -613,10 +616,13 @@ SR_PRIV int lascar_is_logging(const struct sr_dev_inst *sdi)
SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi) SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_usb_dev_inst *usb;
int len, flags, ret; int len, flags, ret;
devc = sdi->priv; devc = sdi->priv;
if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK) usb = sdi->conn;
if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
return SR_ERR; return SR_ERR;
/* Turn on logging. */ /* Turn on logging. */
@ -627,7 +633,7 @@ SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
/* Start logging in 0 seconds. */ /* Start logging in 0 seconds. */
memset(devc->config + 24, 0, 4); memset(devc->config + 24, 0, 4);
ret = lascar_save_config(devc->usb->devhdl, devc->config, len); ret = lascar_save_config(usb->devhdl, devc->config, len);
sr_info("Started internal logging."); sr_info("Started internal logging.");
return ret; return ret;
@ -636,17 +642,20 @@ SR_PRIV int lascar_start_logging(const struct sr_dev_inst *sdi)
SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi) SR_PRIV int lascar_stop_logging(const struct sr_dev_inst *sdi)
{ {
struct dev_context *devc; struct dev_context *devc;
struct sr_usb_dev_inst *usb;
int len, flags, ret; int len, flags, ret;
devc = sdi->priv; devc = sdi->priv;
if (lascar_get_config(devc->usb->devhdl, devc->config, &len) != SR_OK) usb = sdi->conn;
if (lascar_get_config(usb->devhdl, devc->config, &len) != SR_OK)
return SR_ERR; return SR_ERR;
flags = get_flags(devc->config); flags = get_flags(devc->config);
flags &= ~0x0100; flags &= ~0x0100;
set_flags(devc->config, flags); set_flags(devc->config, flags);
ret = lascar_save_config(devc->usb->devhdl, devc->config, len); ret = lascar_save_config(usb->devhdl, devc->config, len);
sr_info("Stopped internal logging."); sr_info("Stopped internal logging.");
return ret; return ret;

1
hardware/lascar-el-usb/protocol.h
View File

@ -44,7 +44,6 @@
/** Private, per-device-instance driver context. */ /** Private, per-device-instance driver context. */
struct dev_context { struct dev_context {
void *cb_data; void *cb_data;
struct sr_usb_dev_inst *usb;
const struct elusb_profile *profile; const struct elusb_profile *profile;
int usbfd[10]; int usbfd[10];
/* Generic EL-USB */ /* Generic EL-USB */