X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fftdi-la%2Fapi.c;h=5a7ac51e52801b9184126cca558534dca2322f52;hp=34f79bf71b71d0066621a422f3cfa45b27a756b5;hb=f1ba6b4b2c9a8ecf90bb31efb218752aa7e49d1a;hpb=dd5c48a6d567a3cac62c4b0058588273bbeea171 diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c index 34f79bf7..5a7ac51e 100644 --- a/src/hardware/ftdi-la/api.c +++ b/src/hardware/ftdi-la/api.c @@ -82,17 +82,16 @@ static const struct ftdi_chip_desc *chip_descs[] = { &ft232r_desc, }; -static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSList **devices) +static void scan_device(struct ftdi_context *ftdic, + struct libusb_device *dev, GSList **devices) { struct libusb_device_descriptor usb_desc; const struct ftdi_chip_desc *desc; struct dev_context *devc; char *vendor, *model, *serial_num; struct sr_dev_inst *sdi; - struct drv_context *drvc; int rv; - drvc = di->context; libusb_get_device_descriptor(dev, &usb_desc); desc = NULL; @@ -115,21 +114,13 @@ static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSL /* Allocate memory for the incoming data. */ devc->data_buf = g_malloc0(DATA_BUF_SIZE); - /* Allocate memory for the FTDI context (ftdic) and initialize it. */ - devc->ftdic = ftdi_new(); - if (!devc->ftdic) { - sr_err("Failed to initialize libftdi."); - goto err_free_data_buf; - } - - devc->usbdev = dev; devc->desc = desc; vendor = g_malloc(32); model = g_malloc(32); serial_num = g_malloc(32); - rv = ftdi_usb_get_strings(devc->ftdic, dev, vendor, 32, - model, 32, serial_num, 32); + rv = ftdi_usb_get_strings(ftdic, dev, vendor, 32, + model, 32, serial_num, 32); switch (rv) { case 0: break; @@ -150,74 +141,59 @@ static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSL sdi->vendor = vendor; sdi->model = model; sdi->serial_num = serial_num; - sdi->driver = di; sdi->priv = devc; + sdi->connection_id = g_strdup_printf("d:%u/%u", + libusb_get_bus_number(dev), libusb_get_device_address(dev)); for (char *const *chan = &(desc->channel_names[0]); *chan; chan++) sr_channel_new(sdi, chan - &(desc->channel_names[0]), SR_CHANNEL_LOGIC, TRUE, *chan); *devices = g_slist_append(*devices, sdi); - drvc->instances = g_slist_append(drvc->instances, sdi); return; err_free_strings: g_free(vendor); g_free(model); g_free(serial_num); - ftdi_free(devc->ftdic); -err_free_data_buf: g_free(devc->data_buf); g_free(devc); } -static GSList *scan_all(struct sr_dev_driver *di, GSList *options) +static GSList *scan_all(struct ftdi_context *ftdic, GSList *options) { GSList *devices; struct ftdi_device_list *devlist = 0; struct ftdi_device_list *curdev; - struct ftdi_context *ftdic; int ret; (void)options; devices = NULL; - /* Allocate memory for the FTDI context (ftdic) and initialize it. */ - ftdic = ftdi_new(); - if (!ftdic) { - sr_err("Failed to initialize libftdi."); - return NULL; - } - ret = ftdi_usb_find_all(ftdic, &devlist, 0, 0); if (ret < 0) { sr_err("Failed to list devices (%d): %s", ret, ftdi_get_error_string(ftdic)); - goto err_free_ftdic; + return NULL; } sr_dbg("Number of FTDI devices found: %d", ret); curdev = devlist; while (curdev) { - scan_device(di, curdev->dev, &devices); + scan_device(ftdic, curdev->dev, &devices); curdev = curdev->next; } ftdi_list_free(&devlist); - ftdi_free(ftdic); return devices; - -err_free_ftdic: - ftdi_free(ftdic); /* NOT free() or g_free()! */ - - return NULL; } static GSList *scan(struct sr_dev_driver *di, GSList *options) { + struct ftdi_context *ftdic; struct sr_config *src; struct sr_usb_dev_inst *usb; const char *conn; @@ -228,7 +204,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) int i; drvc = di->context; - drvc->instances = NULL; conn = NULL; for (l = options; l; l = l->next) { src = l->data; @@ -237,6 +212,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) break; } } + + /* Allocate memory for the FTDI context (ftdic) and initialize it. */ + ftdic = ftdi_new(); + if (!ftdic) { + sr_err("Failed to initialize libftdi."); + return NULL; + } + if (conn) { devices = NULL; libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist); @@ -246,14 +229,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) usb = l->data; if (usb->bus == libusb_get_bus_number(devlist[i]) && usb->address == libusb_get_device_address(devlist[i])) { - scan_device(di, devlist[i], &devices); + scan_device(ftdic, devlist[i], &devices); } } } libusb_free_device_list(devlist, 1); - return devices; } else - return scan_all(di, options); + devices = scan_all(ftdic, options); + + ftdi_free(ftdic); + + return std_scan_complete(di, devices); } static void clear_helper(void *priv) @@ -261,8 +247,6 @@ static void clear_helper(void *priv) struct dev_context *devc; devc = priv; - - ftdi_free(devc->ftdic); g_free(devc->data_buf); g_free(devc); } @@ -279,13 +263,17 @@ static int dev_open(struct sr_dev_inst *sdi) devc = sdi->priv; - ret = ftdi_usb_open_dev(devc->ftdic, devc->usbdev); + devc->ftdic = ftdi_new(); + if (!devc->ftdic) + return SR_ERR; + + ret = ftdi_usb_open_string(devc->ftdic, sdi->connection_id); if (ret < 0) { /* Log errors, except for -3 ("device not found"). */ if (ret != -3) sr_err("Failed to open device (%d): %s", ret, ftdi_get_error_string(devc->ftdic)); - return SR_ERR; + goto err_ftdi_free; } /* Purge RX/TX buffers in the FTDI chip. */ @@ -314,12 +302,14 @@ static int dev_open(struct sr_dev_inst *sdi) } sr_dbg("FTDI chip bitbang mode entered successfully."); - sdi->status = SR_ST_ACTIVE; - return SR_OK; err_dev_open_close_ftdic: ftdi_usb_close(devc->ftdic); + +err_ftdi_free: + ftdi_free(devc->ftdic); + return SR_ERR; } @@ -329,9 +319,12 @@ static int dev_close(struct sr_dev_inst *sdi) devc = sdi->priv; - ftdi_usb_close(devc->ftdic); + if (!devc->ftdic) + return SR_ERR_BUG; - sdi->status = SR_ST_INACTIVE; + ftdi_usb_close(devc->ftdic); + ftdi_free(devc->ftdic); + devc->ftdic = NULL; return SR_OK; } @@ -376,9 +369,6 @@ static int config_set(uint32_t key, GVariant *data, (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; ret = SR_OK; @@ -446,9 +436,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc = sdi->priv; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - if (!devc->ftdic) return SR_ERR_BUG; @@ -458,7 +445,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->samples_sent = 0; devc->bytes_received = 0; - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); /* Hook up a dummy handler to receive data from the device. */ sr_session_source_add(sdi->session, -1, G_IO_IN, 0, @@ -469,13 +456,9 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) static int dev_acquisition_stop(struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - sr_dbg("Stopping acquisition."); sr_session_source_remove(sdi->session, -1); - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); return SR_OK; }