ftdi-la: Cleanup ftdi_context handling
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This commit is contained in:
parent
0350e2e030
commit
07a917521a
|
@ -82,7 +82,8 @@ static const struct ftdi_chip_desc *chip_descs[] = {
|
||||||
&ft232r_desc,
|
&ft232r_desc,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSList **devices)
|
static void scan_device(struct sr_dev_driver *di, struct ftdi_context *ftdic,
|
||||||
|
struct libusb_device *dev, GSList **devices)
|
||||||
{
|
{
|
||||||
struct libusb_device_descriptor usb_desc;
|
struct libusb_device_descriptor usb_desc;
|
||||||
const struct ftdi_chip_desc *desc;
|
const struct ftdi_chip_desc *desc;
|
||||||
|
@ -115,20 +116,15 @@ static void scan_device(struct sr_dev_driver *di, struct libusb_device *dev, GSL
|
||||||
/* Allocate memory for the incoming data. */
|
/* Allocate memory for the incoming data. */
|
||||||
devc->data_buf = g_malloc0(DATA_BUF_SIZE);
|
devc->data_buf = g_malloc0(DATA_BUF_SIZE);
|
||||||
|
|
||||||
/* Allocate memory for the FTDI context (ftdic) and initialize it. */
|
snprintf(devc->address, sizeof(devc->address), "d:%u/%u",
|
||||||
devc->ftdic = ftdi_new();
|
libusb_get_bus_number(dev), libusb_get_device_address(dev));
|
||||||
if (!devc->ftdic) {
|
|
||||||
sr_err("Failed to initialize libftdi.");
|
|
||||||
goto err_free_data_buf;
|
|
||||||
}
|
|
||||||
|
|
||||||
devc->usbdev = dev;
|
|
||||||
devc->desc = desc;
|
devc->desc = desc;
|
||||||
|
|
||||||
vendor = g_malloc(32);
|
vendor = g_malloc(32);
|
||||||
model = g_malloc(32);
|
model = g_malloc(32);
|
||||||
serial_num = g_malloc(32);
|
serial_num = g_malloc(32);
|
||||||
rv = ftdi_usb_get_strings(devc->ftdic, dev, vendor, 32,
|
rv = ftdi_usb_get_strings(ftdic, dev, vendor, 32,
|
||||||
model, 32, serial_num, 32);
|
model, 32, serial_num, 32);
|
||||||
switch (rv) {
|
switch (rv) {
|
||||||
case 0:
|
case 0:
|
||||||
|
@ -165,59 +161,45 @@ err_free_strings:
|
||||||
g_free(vendor);
|
g_free(vendor);
|
||||||
g_free(model);
|
g_free(model);
|
||||||
g_free(serial_num);
|
g_free(serial_num);
|
||||||
ftdi_free(devc->ftdic);
|
|
||||||
err_free_data_buf:
|
|
||||||
g_free(devc->data_buf);
|
g_free(devc->data_buf);
|
||||||
g_free(devc);
|
g_free(devc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static GSList *scan_all(struct sr_dev_driver *di, GSList *options)
|
static GSList *scan_all(struct ftdi_context *ftdic, struct sr_dev_driver *di,
|
||||||
|
GSList *options)
|
||||||
{
|
{
|
||||||
GSList *devices;
|
GSList *devices;
|
||||||
struct ftdi_device_list *devlist = 0;
|
struct ftdi_device_list *devlist = 0;
|
||||||
struct ftdi_device_list *curdev;
|
struct ftdi_device_list *curdev;
|
||||||
struct ftdi_context *ftdic;
|
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
(void)options;
|
(void)options;
|
||||||
|
|
||||||
devices = NULL;
|
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);
|
ret = ftdi_usb_find_all(ftdic, &devlist, 0, 0);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
sr_err("Failed to list devices (%d): %s", ret,
|
sr_err("Failed to list devices (%d): %s", ret,
|
||||||
ftdi_get_error_string(ftdic));
|
ftdi_get_error_string(ftdic));
|
||||||
goto err_free_ftdic;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
sr_dbg("Number of FTDI devices found: %d", ret);
|
sr_dbg("Number of FTDI devices found: %d", ret);
|
||||||
|
|
||||||
curdev = devlist;
|
curdev = devlist;
|
||||||
while (curdev) {
|
while (curdev) {
|
||||||
scan_device(di, curdev->dev, &devices);
|
scan_device(di, ftdic, curdev->dev, &devices);
|
||||||
curdev = curdev->next;
|
curdev = curdev->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
ftdi_list_free(&devlist);
|
ftdi_list_free(&devlist);
|
||||||
ftdi_free(ftdic);
|
|
||||||
|
|
||||||
return devices;
|
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)
|
static GSList *scan(struct sr_dev_driver *di, GSList *options)
|
||||||
{
|
{
|
||||||
|
struct ftdi_context *ftdic;
|
||||||
struct sr_config *src;
|
struct sr_config *src;
|
||||||
struct sr_usb_dev_inst *usb;
|
struct sr_usb_dev_inst *usb;
|
||||||
const char *conn;
|
const char *conn;
|
||||||
|
@ -237,6 +219,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
|
||||||
break;
|
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) {
|
if (conn) {
|
||||||
devices = NULL;
|
devices = NULL;
|
||||||
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
|
libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
|
||||||
|
@ -246,14 +236,17 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
|
||||||
usb = l->data;
|
usb = l->data;
|
||||||
if (usb->bus == libusb_get_bus_number(devlist[i])
|
if (usb->bus == libusb_get_bus_number(devlist[i])
|
||||||
&& usb->address == libusb_get_device_address(devlist[i])) {
|
&& usb->address == libusb_get_device_address(devlist[i])) {
|
||||||
scan_device(di, devlist[i], &devices);
|
scan_device(di, ftdic, devlist[i], &devices);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
libusb_free_device_list(devlist, 1);
|
libusb_free_device_list(devlist, 1);
|
||||||
return devices;
|
|
||||||
} else
|
} else
|
||||||
return scan_all(di, options);
|
devices = scan_all(ftdic, di, options);
|
||||||
|
|
||||||
|
ftdi_free(ftdic);
|
||||||
|
|
||||||
|
return devices;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void clear_helper(void *priv)
|
static void clear_helper(void *priv)
|
||||||
|
@ -261,8 +254,6 @@ static void clear_helper(void *priv)
|
||||||
struct dev_context *devc;
|
struct dev_context *devc;
|
||||||
|
|
||||||
devc = priv;
|
devc = priv;
|
||||||
|
|
||||||
ftdi_free(devc->ftdic);
|
|
||||||
g_free(devc->data_buf);
|
g_free(devc->data_buf);
|
||||||
g_free(devc);
|
g_free(devc);
|
||||||
}
|
}
|
||||||
|
@ -279,13 +270,17 @@ static int dev_open(struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
devc = sdi->priv;
|
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, devc->address);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
/* Log errors, except for -3 ("device not found"). */
|
/* Log errors, except for -3 ("device not found"). */
|
||||||
if (ret != -3)
|
if (ret != -3)
|
||||||
sr_err("Failed to open device (%d): %s", ret,
|
sr_err("Failed to open device (%d): %s", ret,
|
||||||
ftdi_get_error_string(devc->ftdic));
|
ftdi_get_error_string(devc->ftdic));
|
||||||
return SR_ERR;
|
goto err_ftdi_free;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Purge RX/TX buffers in the FTDI chip. */
|
/* Purge RX/TX buffers in the FTDI chip. */
|
||||||
|
@ -317,9 +312,10 @@ static int dev_open(struct sr_dev_inst *sdi)
|
||||||
sdi->status = SR_ST_ACTIVE;
|
sdi->status = SR_ST_ACTIVE;
|
||||||
|
|
||||||
return SR_OK;
|
return SR_OK;
|
||||||
|
|
||||||
err_dev_open_close_ftdic:
|
err_dev_open_close_ftdic:
|
||||||
ftdi_usb_close(devc->ftdic);
|
ftdi_usb_close(devc->ftdic);
|
||||||
|
err_ftdi_free:
|
||||||
|
ftdi_free(devc->ftdic);
|
||||||
return SR_ERR;
|
return SR_ERR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -329,7 +325,11 @@ static int dev_close(struct sr_dev_inst *sdi)
|
||||||
|
|
||||||
devc = sdi->priv;
|
devc = sdi->priv;
|
||||||
|
|
||||||
ftdi_usb_close(devc->ftdic);
|
if (devc->ftdic) {
|
||||||
|
ftdi_usb_close(devc->ftdic);
|
||||||
|
ftdi_free(devc->ftdic);
|
||||||
|
devc->ftdic = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
sdi->status = SR_ST_INACTIVE;
|
sdi->status = SR_ST_INACTIVE;
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ struct ftdi_chip_desc {
|
||||||
struct dev_context {
|
struct dev_context {
|
||||||
struct ftdi_context *ftdic;
|
struct ftdi_context *ftdic;
|
||||||
const struct ftdi_chip_desc *desc;
|
const struct ftdi_chip_desc *desc;
|
||||||
struct libusb_device *usbdev;
|
char address[sizeof("d:000:000")];
|
||||||
|
|
||||||
uint64_t limit_samples;
|
uint64_t limit_samples;
|
||||||
uint32_t cur_samplerate;
|
uint32_t cur_samplerate;
|
||||||
|
|
Loading…
Reference in New Issue